Generated files from "arm-generic-codesearch" build 0, revision 8b675e931fd26d59f2f902d86087733849ff470e
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.cc
index 3a67c60..722d0d2 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.cc
@@ -194,5 +194,10 @@
     "Power.StandardDimDeferredByHps.DurationSeconds";
 
 const char kLockEvent[] = "Power.LockEvent";
+
+const char kAmbientLightOnResumeName[] = "Power.AmbientLightOnResume";
+const int kAmbientLightOnResumeMin = 0;
+const int kAmbientLightOnResumeMax = 100000;
+
 }  // namespace metrics
 }  // namespace power_manager
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.h
index fc6116e..a5c7f9e 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/common/metrics_constants.h
@@ -159,6 +159,11 @@
 extern const char kStandardDimDeferredByHpsSec[];
 
 extern const char kLockEvent[];
+
+extern const char kAmbientLightOnResumeName[];
+extern const int kAmbientLightOnResumeMin;
+extern const int kAmbientLightOnResumeMax;
+
 // Values for kBatteryInfoSampleName.
 enum class BatteryInfoSampleResult {
   READ,
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.cc
index a5faa4e..96bf64f 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.cc
@@ -134,6 +134,13 @@
         &MetricsCollector::GenerateBacklightLevelMetrics);
   }
 
+  if (display_backlight_controller_) {
+    display_backlight_controller_->RegisterAmbientLightResumeMetricsHandler(
+        base::BindRepeating(
+            &MetricsCollector::GenerateAmbientLightResumeMetrics,
+            base::Unretained(this)));
+  }
+
   bool pref_val = false;
   suspend_to_idle_ = prefs_->GetBool(kSuspendToIdlePref, &pref_val) && pref_val;
 
@@ -649,6 +656,11 @@
              kNumOfSessionsPerChargeMax, kDefaultBuckets);
 }
 
+void MetricsCollector::GenerateAmbientLightResumeMetrics(int lux) {
+  SendMetric(kAmbientLightOnResumeName, lux, kAmbientLightOnResumeMin,
+             kAmbientLightOnResumeMax, kDefaultBuckets);
+}
+
 void MetricsCollector::TrackS0ixResidency(bool pre_suspend) {
   // This method should be invoked only when suspend to idle is enabled.
   DCHECK(suspend_to_idle_);
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.h
index 1c2b171..45046f7 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector.h
@@ -161,6 +161,9 @@
     prefix_path_for_testing_ = file;
   }
 
+  // Generates UMA metrics about Ambient Light level on Resume.
+  void GenerateAmbientLightResumeMetrics(int lux);
+
  private:
   friend class MetricsCollectorTest;
   FRIEND_TEST(MetricsCollectorTest, BacklightLevel);
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector_test.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector_test.cc
index d936bf3..98b508f 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector_test.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/metrics_collector_test.cc
@@ -496,6 +496,16 @@
   collector_.HandlePowerButtonEvent(ButtonState::UP);
 }
 
+TEST_F(MetricsCollectorTest, AmbientLightResumeMetric) {
+  Init();
+  ASSERT_TRUE(display_backlight_controller_
+                  .ambient_light_metrics_callback_registered());
+
+  ExpectMetric(kAmbientLightOnResumeName, 2400, kAmbientLightOnResumeMin,
+               kAmbientLightOnResumeMax, kDefaultBuckets);
+  collector_.GenerateAmbientLightResumeMetrics(2400);
+}
+
 TEST_F(MetricsCollectorTest, GatherDarkResumeMetrics) {
   Init();
 
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.cc
index 27962f1..0c3a318 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.cc
@@ -158,6 +158,7 @@
 
 void AmbientLightHandler::HandleResume() {
   hysteresis_state_ = HysteresisState::RESUMING;
+  report_on_resuming_ = true;
 }
 
 std::string AmbientLightHandler::GetRecentReadingsString() const {
@@ -177,7 +178,12 @@
 
   // Discard first reading after resume as it is probably cached value.
   if (hysteresis_state_ == HysteresisState::RESUMING) {
-    hysteresis_state_ = HysteresisState::IMMEDIATE;
+    if (delegate_->IsUsingAmbientLight()) {
+      hysteresis_state_ = HysteresisState::IMMEDIATE;
+    } else {
+      // Return to stable state if ALS is not being used by delegate
+      hysteresis_state_ = HysteresisState::STABLE;
+    }
     return;
   }
 
@@ -187,6 +193,11 @@
     return;
   }
 
+  if (report_on_resuming_) {
+    report_on_resuming_ = false;
+    delegate_->ReportAmbientLightOnResumeMetrics(raw_lux);
+  }
+
   // Currently we notify on every color temperature change.
   if (sensor_->IsColorSensor()) {
     const int color_temperature = sensor_->GetColorTemperature();
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.h
index 17c2070..bfc523f 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler.h
@@ -55,6 +55,12 @@
 
     // Invoked when the color temperature changes.
     virtual void OnColorTemperatureChanged(int color_temperature) = 0;
+
+    // Invoked when ALS reading is taken after resume from suspension.
+    virtual void ReportAmbientLightOnResumeMetrics(int lux) {}
+
+    // Used to shortcut ALS calculations if they are not being used by Delegate.
+    virtual bool IsUsingAmbientLight() const { return true; }
   };
 
   AmbientLightHandler(system::AmbientLightSensorInterface* sensor,
@@ -200,6 +206,9 @@
   // around). Used for logging.
   std::vector<int> recent_lux_readings_;
   int recent_lux_start_index_ = 0;
+
+  // Does the ambient light sensor need to report its next reading.
+  bool report_on_resuming_ = false;
 };
 
 }  // namespace policy
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler_test.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler_test.cc
index 49df195..942aa3c 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler_test.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/ambient_light_handler_test.cc
@@ -23,7 +23,8 @@
  public:
   TestDelegate()
       : percent_(-1.0),
-        cause_(AmbientLightHandler::BrightnessChangeCause::AMBIENT_LIGHT) {}
+        cause_(AmbientLightHandler::BrightnessChangeCause::AMBIENT_LIGHT),
+        resume_lux_(0) {}
   TestDelegate(const TestDelegate&) = delete;
   TestDelegate& operator=(const TestDelegate&) = delete;
 
@@ -31,6 +32,7 @@
 
   double percent() const { return percent_; }
   AmbientLightHandler::BrightnessChangeCause cause() const { return cause_; }
+  int lux_on_resume() const { return resume_lux_; }
 
   void SetBrightnessPercentForAmbientLight(
       double brightness_percent,
@@ -41,9 +43,14 @@
 
   void OnColorTemperatureChanged(int color_temperature) override {}
 
+  void ReportAmbientLightOnResumeMetrics(int lux) override {
+    resume_lux_ = lux;
+  }
+
  private:
   double percent_;
   AmbientLightHandler::BrightnessChangeCause cause_;
+  int resume_lux_;
 };
 
 class AmbientLightHandlerTest : public ::testing::Test {
@@ -181,10 +188,13 @@
   // brightness to go to lower level
   handler_.HandleResume();
   UpdateSensor(50);  // First reading is discard as it is probably cached value.
+  EXPECT_EQ(delegate_.lux_on_resume(), 0);
   UpdateSensor(10);
   EXPECT_DOUBLE_EQ(20.0, delegate_.percent());
   EXPECT_EQ(AmbientLightHandler::BrightnessChangeCause::AMBIENT_LIGHT,
             delegate_.cause());
+  // Second lux reading after resume is reported for metrics
+  EXPECT_EQ(delegate_.lux_on_resume(), 10);
 }
 
 TEST_F(AmbientLightHandlerTest, PowerSources) {
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller.h
index ef1ddfd..ceb93ef 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller.h
@@ -137,6 +137,13 @@
   using GetToggledOffCallback =
       base::RepeatingCallback<void(bool* toggled_off)>;
 
+  using AmbientLightOnResumeMetricsCallback =
+      base::RepeatingCallback<void(int lux)>;
+  // Optionally register a handler for collecting ambient light on resume
+  // metrics.
+  virtual void RegisterAmbientLightResumeMetricsHandler(
+      AmbientLightOnResumeMetricsCallback callback) {}
+
  protected:
   // Helper methods that implementations can use to register D-Bus method call
   // handlers.
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.cc
index 37b6e51..30d77b1 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.cc
@@ -137,5 +137,11 @@
   return 0;
 }
 
+void BacklightControllerStub::RegisterAmbientLightResumeMetricsHandler(
+    AmbientLightOnResumeMetricsCallback callback) {
+  DCHECK(callback);
+  ambient_light_metrics_callback_registered_ = true;
+}
+
 }  // namespace policy
 }  // namespace power_manager
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.h
index edaa167..cb21e66 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/backlight_controller_stub.h
@@ -61,6 +61,9 @@
   bool suspended() const { return suspended_; }
   bool shutting_down() const { return shutting_down_; }
   bool forced_off() const { return forced_off_; }
+  bool ambient_light_metrics_callback_registered() const {
+    return ambient_light_metrics_callback_registered_;
+  }
 
   void set_percent(double percent) { percent_ = percent; }
   void set_num_als_adjustments(int num) { num_als_adjustments_ = num; }
@@ -101,6 +104,9 @@
   double LevelToPercent(int64_t level) const override;
   int64_t PercentToLevel(double percent) const override;
 
+  void RegisterAmbientLightResumeMetricsHandler(
+      AmbientLightOnResumeMetricsCallback callback) override;
+
  private:
   base::ObserverList<BacklightControllerObserver> observers_;
 
@@ -125,6 +131,7 @@
   bool suspended_ = false;
   bool shutting_down_ = false;
   bool forced_off_ = false;
+  bool ambient_light_metrics_callback_registered_ = false;
 
   // Counts to be returned by GetNum*Adjustments().
   int num_als_adjustments_ = 0;
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.cc
index 0457b43..6cfd342 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <cmath>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <base/check.h>
@@ -415,7 +416,7 @@
   suspended_ = suspended;
   UpdateState(BacklightBrightnessChange_Cause_OTHER);
 
-  if (!suspended && use_ambient_light_)
+  if (!suspended && ambient_light_handler_)
     ambient_light_handler_->HandleResume();
 }
 
@@ -529,6 +530,21 @@
   dbus_wrapper_->EmitSignal(&signal);
 }
 
+bool InternalBacklightController::IsUsingAmbientLight() const {
+  return use_ambient_light_;
+}
+
+void InternalBacklightController::ReportAmbientLightOnResumeMetrics(int lux) {
+  if (ambient_light_metrics_callback_) {
+    ambient_light_metrics_callback_.Run(lux);
+  }
+}
+
+void InternalBacklightController::RegisterAmbientLightResumeMetricsHandler(
+    AmbientLightOnResumeMetricsCallback callback) {
+  ambient_light_metrics_callback_ = std::move(callback);
+}
+
 double InternalBacklightController::SnapBrightnessPercentToNearestStep(
     double percent) const {
   return round(percent / step_percent_) * step_percent_;
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.h
index 338cd59..1feb38b 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/chromeos-config-tools-9999/work/chromeos-config-tools-9999/platform2/power_manager/powerd/policy/internal_backlight_controller.h
@@ -119,6 +119,11 @@
       double brightness_percent,
       AmbientLightHandler::BrightnessChangeCause cause) override;
   void OnColorTemperatureChanged(int color_temperature) override;
+  void ReportAmbientLightOnResumeMetrics(int lux) override;
+  bool IsUsingAmbientLight() const override;
+
+  void RegisterAmbientLightResumeMetricsHandler(
+      AmbientLightOnResumeMetricsCallback callback) override;
 
  private:
   // Snaps |percent| to the nearest step, as defined by |step_percent_|.
@@ -208,6 +213,9 @@
   // |ambient_light_handler_|.
   double ambient_light_brightness_percent_ = 100.0;
 
+  // Ambient Light Sensor On Resume metrics reporting callback;
+  AmbientLightOnResumeMetricsCallback ambient_light_metrics_callback_;
+
   // User- or policy-set brightness percent when on AC or battery power.
   double ac_explicit_brightness_percent_ = 100.0;
   double battery_explicit_brightness_percent_ = 100.0;
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/libhwsec/backend/tpm1/recovery_crypto.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/libhwsec/backend/tpm1/recovery_crypto.cc
index ad6af81..0ca8a37 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/libhwsec/backend/tpm1/recovery_crypto.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/libhwsec/backend/tpm1/recovery_crypto.cc
@@ -56,18 +56,20 @@
                    ParseRsaFromTpmPubkeyBlob(overalls, public_key),
                    _.WithStatus<TPMError>("Failed to parse RSA public key"));
 
-  int der_length = i2d_RSAPublicKey(rsa.get(), nullptr);
+  int der_length = i2d_RSA_PUBKEY(rsa.get(), nullptr);
   if (der_length < 0) {
-    return MakeStatus<TPMError>("Failed to DER-encode public key",
-                                TPMRetryAction::kNoRetry);
+    return MakeStatus<TPMError>(
+        "Failed to DER-encode public key using SubjectPublicKeyInfo",
+        TPMRetryAction::kNoRetry);
   }
 
   brillo::Blob public_key_der(der_length);
   uint8_t* buffer = public_key_der.data();
-  der_length = i2d_RSAPublicKey(rsa.get(), &buffer);
+  der_length = i2d_RSA_PUBKEY(rsa.get(), &buffer);
   if (der_length < 0) {
-    return MakeStatus<TPMError>("Failed to DER-encode public key",
-                                TPMRetryAction::kNoRetry);
+    return MakeStatus<TPMError>(
+        "Failed to DER-encode public key using SubjectPublicKeyInfo",
+        TPMRetryAction::kNoRetry);
   }
   public_key_der.resize(der_length);
 
diff --git a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/meson-log.txt b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/meson-log.txt
index a1c7065..edb3ecb 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/meson-log.txt
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/meson-log.txt
@@ -1,4 +1,4 @@
-Build started at 2022-09-13T08:51:32.298729
+Build started at 2022-09-13T14:29:42.517638
 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-r1467/temp/meson.armv7a-cros-linux-gnueabihf.arm.ini' '--native-file /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpsajhmrdu
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpsajhmrdu/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpsajhmrdu/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-r1467/work/flashrom-0.9.9-build/meson-private/tmph0ggcujf
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmph0ggcujf/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmph0ggcujf/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp623jjwb8
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp623jjwb8/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp623jjwb8/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp02jjzkm3
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp02jjzkm3/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp02jjzkm3/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpw6jsx0t6
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpw6jsx0t6/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpw6jsx0t6/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp13vtdkzf
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp13vtdkzf/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp13vtdkzf/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp83eawhia
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp83eawhia/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp83eawhia/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp6ykjyq9s
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp6ykjyq9s/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp6ykjyq9s/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp9x4vw3nm
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp9x4vw3nm/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp9x4vw3nm/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp119az13a
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp119az13a/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp119az13a/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp0cretdpz
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp0cretdpz/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp0cretdpz/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpznzhg7on
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpznzhg7on/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpznzhg7on/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp2mjtrd3k
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp2mjtrd3k/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp2mjtrd3k/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-r1467/work/flashrom-0.9.9-build/meson-private/tmphekws4p4
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmphekws4p4/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmphekws4p4/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp28u_a8zm
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp28u_a8zm/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp28u_a8zm/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpkgx6d3gs
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpkgx6d3gs/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpkgx6d3gs/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpdlbpk60l
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpdlbpk60l/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpdlbpk60l/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpipfnffkx
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpipfnffkx/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpipfnffkx/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-r1467/work/flashrom-0.9.9-build/meson-private/tmppbwm5qjy
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmppbwm5qjy/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmppbwm5qjy/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpxgxdq4v1
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpxgxdq4v1/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpxgxdq4v1/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpc9ef7dgy
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpc9ef7dgy/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpc9ef7dgy/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp2pt69cq1
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp2pt69cq1/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp2pt69cq1/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp5qh4lxm_
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp5qh4lxm_/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp5qh4lxm_/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpqhjk1l0s
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpqhjk1l0s/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpqhjk1l0s/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp_3nu8rhj
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp_3nu8rhj/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp_3nu8rhj/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpsvo5opzs
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpsvo5opzs/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpsvo5opzs/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-r1467/work/flashrom-0.9.9-build/meson-private/tmplji72r1u
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmplji72r1u/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmplji72r1u/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp9urjkakl
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp9urjkakl/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp9urjkakl/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp0u_coc7d
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp0u_coc7d/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp0u_coc7d/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-r1467/work/flashrom-0.9.9-build/meson-private/tmph4h_trva
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmph4h_trva/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmph4h_trva/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpee1zrfsa
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpee1zrfsa/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpee1zrfsa/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp1llnnwti
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp1llnnwti/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmp1llnnwti/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpee1zrfsa/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-r1467/work/flashrom-0.9.9-build/meson-private/tmp1llnnwti/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpe08pckdp
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpe08pckdp/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpe08pckdp/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpti83s2r9
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpti83s2r9/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpti83s2r9/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpv_bz2juv
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpv_bz2juv/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpv_bz2juv/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpbiduvv40
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpbiduvv40/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpbiduvv40/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpbrw21i72
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpbrw21i72/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpbrw21i72/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-r1467/work/flashrom-0.9.9-build/meson-private/tmpr2tolbpq
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpr2tolbpq/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-private/tmpr2tolbpq/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-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.json b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.json
index f3f6898..43acc4c 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.json
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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 14 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      ] 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      ] 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[==========] 14 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": 1663084299.852818, "duration": 10.925167322158813, "returncode": 0, "env": {"SANDBOX_MESSAGE_P@TH": "/proc/12047/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-r1467/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-r1467/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_121d6ec074232b3094218bca967b5335212c962d 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-r1467/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-r1467.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": "12082", "PORTAGE_REPO_NAME": "chromiumos", "PWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/temp", "S": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/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-r1467/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-r1467/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-R107-15112.0.0-39845-8803197980409855105/packages", "OPENMPI_OFED_FEATURES": "", "NM_FOR_BUILD": "llvm-nm", "ABI_ARM": "", "PORTAGE_INTERNAL_CALLER": "1", "PORTAGE_COMPRESSION_COMMAND": "zstd -3", "PVR": "0.9.9-r1467", "MARCH_TUNE": "", "PKG_LOGDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/logging", "READELF": "llvm-readelf", "CPU_FLAGS_ARM": "", "ASAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-15112.0.0-rc1/packages/", "PORTAGE_BUILD_USER": "chrome-bot", "VCSID": "0.9.9-r1467-240388765153af4f68ee2edd69e77991591b686c", "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", "EROOT": "/build/arm-generic", "LESSOPEN": "|lesspipe %s", "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-r1467:20220913-155126.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:36649", "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-r1467/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-r1467/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-r1467/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-r1467/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-12047.log", "PR": "r1467", "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-r1467", "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-r1467/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-r1467/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-r1467/temp/asan_logs/asan", "CHOST": "armv7a-cros-linux-gnueabihf", "TMP": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp", "PORTAGE_INST_GID": "0", "OBJDUMP": "llvm-objdump", "PATH": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-12047.log", "PORTAGE_BZIP2_COMMAND": "lbzip2 -z", "PORTAGE_BUILDDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467", "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": "121d6ec074232b3094218bca967b5335212c962d", "OLDPWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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_": "182"}, "command": ["/mnt/host/source/src/platform2/common-mk/meson_test.py", "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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  ] 12 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-r1467/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 14 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      ] 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      ] 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[==========] 14 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": 1663104589.636598, "duration": 10.780951976776123, "returncode": 0, "env": {"SANDBOX_MESSAGE_P@TH": "/proc/11371/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-r1467/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-r1467/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_121d6ec074232b3094218bca967b5335212c962d 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-r1467/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-r1467.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": "11397", "PORTAGE_REPO_NAME": "chromiumos", "PWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/temp", "S": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/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-r1467/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-r1467/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-R107-15112.0.0-39877-8803137353401282177/packages", "OPENMPI_OFED_FEATURES": "", "NM_FOR_BUILD": "llvm-nm", "ABI_ARM": "", "PORTAGE_INTERNAL_CALLER": "1", "PORTAGE_COMPRESSION_COMMAND": "zstd -3", "PVR": "0.9.9-r1467", "MARCH_TUNE": "", "PKG_LOGDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/logging", "READELF": "llvm-readelf", "CPU_FLAGS_ARM": "", "ASAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-15112.0.0-rc1/packages/", "PORTAGE_BUILD_USER": "chrome-bot", "VCSID": "0.9.9-r1467-240388765153af4f68ee2edd69e77991591b686c", "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", "EROOT": "/build/arm-generic", "LESSOPEN": "|lesspipe %s", "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-r1467:20220913-212937.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:37459", "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-r1467/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-r1467/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-r1467/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-r1467/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-11371.log", "PR": "r1467", "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-r1467", "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-r1467/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-r1467/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-r1467/temp/asan_logs/asan", "CHOST": "armv7a-cros-linux-gnueabihf", "TMP": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp", "PORTAGE_INST_GID": "0", "OBJDUMP": "llvm-objdump", "PATH": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-11371.log", "PORTAGE_BZIP2_COMMAND": "lbzip2 -z", "PORTAGE_BUILDDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467", "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": "121d6ec074232b3094218bca967b5335212c962d", "OLDPWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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_": "1"}, "command": ["/mnt/host/source/src/platform2/common-mk/meson_test.py", "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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  ] 12 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-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml
index 757b19b..3dbf041 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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.925167322158813"><testcase classname="flashromutils" name="cmocka test flashrom" time="10.925167322158813"><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-r1467/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="10.780951976776123"><testcase classname="flashromutils" name="cmocka test flashrom" time="10.780951976776123"><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-r1467/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-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.txt b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.txt
index 0119332..786fd7b 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.txt
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/meson-logs/testlog.txt
@@ -1,11 +1,11 @@
-Log of Meson test suite run on 2022-09-13T08:51:39.851076
+Log of Meson test suite run on 2022-09-13T14:29:49.634955
 
-Inherited environment: SANDBOX_MESSAGE_P@TH=/proc/12047/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-r1467/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-r1467/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_121d6ec074232b3094218bca967b5335212c962d 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-r1467/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-r1467.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=12082 PORTAGE_REPO_NAME=chromiumos PWD=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/temp S=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/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-r1467/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/11371/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-r1467/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-r1467/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_121d6ec074232b3094218bca967b5335212c962d 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-r1467/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-r1467.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=11397 PORTAGE_REPO_NAME=chromiumos PWD=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/temp S=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-r1467/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-r1467/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-r1467/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-r1467/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-R107-15112.0.0-39845-8803197980409855105/packages OPENMPI_OFED_FEATURES='' NM_FOR_BUILD=llvm-nm ABI_ARM='' PORTAGE_INTERNAL_CALLER=1 PORTAGE_COMPRESSION_COMMAND='zstd -3' PVR=0.9.9-r1467 MARCH_TUNE='' PKG_LOGDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/logging READELF=llvm-readelf CPU_FLAGS_ARM='' ASAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-15112.0.0-rc1/packages/ PORTAGE_BUILD_USER=chrome-bot VCSID=0.9.9-r1467-240388765153af4f68ee2edd69e77991591b686c 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 EROOT=/build/arm-generic LESSOPEN='|lesspipe %s' 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-r1467:20220913-155126.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:36649 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-r1467/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-r1467/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-r1467/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-R107-15112.0.0-39877-8803137353401282177/packages OPENMPI_OFED_FEATURES='' NM_FOR_BUILD=llvm-nm ABI_ARM='' PORTAGE_INTERNAL_CALLER=1 PORTAGE_COMPRESSION_COMMAND='zstd -3' PVR=0.9.9-r1467 MARCH_TUNE='' PKG_LOGDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/logging READELF=llvm-readelf CPU_FLAGS_ARM='' ASAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-15112.0.0-rc1/packages/ PORTAGE_BUILD_USER=chrome-bot VCSID=0.9.9-r1467-240388765153af4f68ee2edd69e77991591b686c 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 EROOT=/build/arm-generic LESSOPEN='|lesspipe %s' 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-r1467:20220913-212937.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:37459 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-r1467/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-r1467/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-r1467/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-r1467/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-12047.log PR=r1467 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-r1467 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-r1467/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-r1467/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-r1467/temp/asan_logs/asan' CHOST=armv7a-cros-linux-gnueabihf TMP=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp PORTAGE_INST_GID=0 OBJDUMP=llvm-objdump PATH=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-12047.log PORTAGE_BZIP2_COMMAND='lbzip2 -z' PORTAGE_BUILDDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467 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-r1467/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-r1467/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-11371.log PR=r1467 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-r1467 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-r1467/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-r1467/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-r1467/temp/asan_logs/asan' CHOST=armv7a-cros-linux-gnueabihf TMP=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp PORTAGE_INST_GID=0 OBJDUMP=llvm-objdump PATH=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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-11371.log PORTAGE_BZIP2_COMMAND='lbzip2 -z' PORTAGE_BUILDDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467 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=121d6ec074232b3094218bca967b5335212c962d OLDPWD=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/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.93s
-15:51:39 MESON_EXE_WRAPPER=/mnt/host/source/src/platform2/common-mk/meson_test.py MALLOC_PERTURB_=182 /mnt/host/source/src/platform2/common-mk/meson_test.py /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1467/work/flashrom-0.9.9-build/tests/flashrom_unit_tests
+1/1 cmocka test flashrom OK             10.78s
+21:29:49 MALLOC_PERTURB_=1 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-r1467/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-r1467/work/flashrom-0.9.9-build/tests/flashrom_unit_tests']
diff --git a/chroot/build/arm-generic/usr/include/chromeos/dbus/login_manager/dbus-constants.h b/chroot/build/arm-generic/usr/include/chromeos/dbus/login_manager/dbus-constants.h
index 19445be..155ab7a 100644
--- a/chroot/build/arm-generic/usr/include/chromeos/dbus/login_manager/dbus-constants.h
+++ b/chroot/build/arm-generic/usr/include/chromeos/dbus/login_manager/dbus-constants.h
@@ -74,6 +74,8 @@
 const char kSessionManagerQueryAdbSideload[] = "QueryAdbSideload";
 const char kSessionManagerStartBrowserDataMigration[] =
     "StartBrowserDataMigration";
+const char kSessionManagerStartBrowserDataBackwardMigration[] =
+    "StartBrowserDataBackwardMigration";
 // Signals
 const char kLoginPromptVisibleSignal[] = "LoginPromptVisible";
 const char kSessionStateChangedSignal[] = "SessionStateChanged";
diff --git a/chroot/build/arm-generic/usr/include/login_manager-client/login_manager/dbus-constants.h b/chroot/build/arm-generic/usr/include/login_manager-client/login_manager/dbus-constants.h
index 19445be..155ab7a 100644
--- a/chroot/build/arm-generic/usr/include/login_manager-client/login_manager/dbus-constants.h
+++ b/chroot/build/arm-generic/usr/include/login_manager-client/login_manager/dbus-constants.h
@@ -74,6 +74,8 @@
 const char kSessionManagerQueryAdbSideload[] = "QueryAdbSideload";
 const char kSessionManagerStartBrowserDataMigration[] =
     "StartBrowserDataMigration";
+const char kSessionManagerStartBrowserDataBackwardMigration[] =
+    "StartBrowserDataBackwardMigration";
 // Signals
 const char kLoginPromptVisibleSignal[] = "LoginPromptVisible";
 const char kSessionStateChangedSignal[] = "SessionStateChanged";
diff --git a/chroot/build/arm-generic/usr/include/session_manager-client-test/session_manager/dbus-proxy-mocks.h b/chroot/build/arm-generic/usr/include/session_manager-client-test/session_manager/dbus-proxy-mocks.h
index 72a4804..e1d736d 100644
--- a/chroot/build/arm-generic/usr/include/session_manager-client-test/session_manager/dbus-proxy-mocks.h
+++ b/chroot/build/arm-generic/usr/include/session_manager-client-test/session_manager/dbus-proxy-mocks.h
@@ -436,6 +436,15 @@
                     base::OnceCallback<void()> /*success_callback*/,
                     base::OnceCallback<void(brillo::Error*)> /*error_callback*/,
                     int /*timeout_ms*/));
+  MOCK_METHOD3(StartBrowserDataBackwardMigration,
+               bool(const std::string& /*in_account_id*/,
+                    brillo::ErrorPtr* /*error*/,
+                    int /*timeout_ms*/));
+  MOCK_METHOD4(StartBrowserDataBackwardMigrationAsync,
+               void(const std::string& /*in_account_id*/,
+                    base::OnceCallback<void()> /*success_callback*/,
+                    base::OnceCallback<void(brillo::Error*)> /*error_callback*/,
+                    int /*timeout_ms*/));
   MOCK_METHOD2(UnblockDevModeForInitialStateDetermination,
                bool(brillo::ErrorPtr* /*error*/,
                     int /*timeout_ms*/));
diff --git a/chroot/build/arm-generic/usr/include/session_manager-client/session_manager/dbus-proxies.h b/chroot/build/arm-generic/usr/include/session_manager-client/session_manager/dbus-proxies.h
index 078d366..b74b134 100644
--- a/chroot/build/arm-generic/usr/include/session_manager-client/session_manager/dbus-proxies.h
+++ b/chroot/build/arm-generic/usr/include/session_manager-client/session_manager/dbus-proxies.h
@@ -534,6 +534,17 @@
       base::OnceCallback<void(brillo::Error*)> error_callback,
       int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) = 0;
 
+  virtual bool StartBrowserDataBackwardMigration(
+      const std::string& in_account_id,
+      brillo::ErrorPtr* error,
+      int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) = 0;
+
+  virtual void StartBrowserDataBackwardMigrationAsync(
+      const std::string& in_account_id,
+      base::OnceCallback<void()> success_callback,
+      base::OnceCallback<void(brillo::Error*)> error_callback,
+      int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) = 0;
+
   virtual bool UnblockDevModeForInitialStateDetermination(
       brillo::ErrorPtr* error,
       int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) = 0;
@@ -2060,6 +2071,36 @@
         in_mode);
   }
 
+  bool StartBrowserDataBackwardMigration(
+      const std::string& in_account_id,
+      brillo::ErrorPtr* error,
+      int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) override {
+    auto response = brillo::dbus_utils::CallMethodAndBlockWithTimeout(
+        timeout_ms,
+        dbus_object_proxy_,
+        "org.chromium.SessionManagerInterface",
+        "StartBrowserDataBackwardMigration",
+        error,
+        in_account_id);
+    return response && brillo::dbus_utils::ExtractMethodCallResults(
+        response.get(), error);
+  }
+
+  void StartBrowserDataBackwardMigrationAsync(
+      const std::string& in_account_id,
+      base::OnceCallback<void()> success_callback,
+      base::OnceCallback<void(brillo::Error*)> error_callback,
+      int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) override {
+    brillo::dbus_utils::CallMethodWithTimeout(
+        timeout_ms,
+        dbus_object_proxy_,
+        "org.chromium.SessionManagerInterface",
+        "StartBrowserDataBackwardMigration",
+        std::move(success_callback),
+        std::move(error_callback),
+        in_account_id);
+  }
+
   bool UnblockDevModeForInitialStateDetermination(
       brillo::ErrorPtr* error,
       int timeout_ms = dbus::ObjectProxy::TIMEOUT_USE_DEFAULT) override {
diff --git a/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/cargo-lock-7.1.0/.cargo-checksum.json b/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/cargo-lock-7.1.0/.cargo-checksum.json
index 482257f..20484b7 100644
--- a/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/cargo-lock-7.1.0/.cargo-checksum.json
+++ b/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/cargo-lock-7.1.0/.cargo-checksum.json
@@ -1,8 +1,8 @@
 {
-	"package": "316f28ed4feda5d58e436485cd730fba0b0dcd888bb50edd0527a30087e27d0f",
+	"package": "1aeb6750c649b378eb474d926d18bfc8acbb6946d4062ad62a93783dd4c9719e",
 	"files": {
 		"Cargo.toml.orig": "4b150b0f1207ca84209cc5651c4d85cff3e8fbb123b1071cdf0da0f55f6f792c",
-		"Cargo.lock": "7137f480305d319c406407e58840162a4beee1af1ddfbb90a27129af670cfb00",
+		"Cargo.lock": "69213e0e8b88b78a3238659d59afae9991f540deb3d07d349c4bdc34070b1b5d",
 		"tests/lockfile.rs": "53ee50f094faa1274d6a4b6953ed270216a062dbb712f582c76ebabb5adffb4a",
 		"tests/examples/Cargo.lock.v3": "a00f206d76efdb60a9197b457728d3ba91c9051145821330c781b564ac6078ff",
 		"tests/examples/Cargo.lock": "a00f206d76efdb60a9197b457728d3ba91c9051145821330c781b564ac6078ff",
diff --git a/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/system_api-0.24.53/.cargo-checksum.json b/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/system_api-0.24.53/.cargo-checksum.json
index a0c77c0..36a708c 100644
--- a/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/system_api-0.24.53/.cargo-checksum.json
+++ b/chroot/build/arm-generic/usr/lib/cros_rust_registry/store/system_api-0.24.53/.cargo-checksum.json
@@ -1,12 +1,12 @@
 {
-	"package": "38011f9ba02b4d17985ec4e82cc16fdaf378d9e12dc07c99b995f90fcd55e6ed",
+	"package": "e3757e5db7c1eb3b2427a7ffa42557b982fc493f4bb3c483f43f1f6c3e00af7d",
 	"files": {
 		"Cargo.toml.orig": "6a66d9f5d50fff6012e9155c6c18f29465976b4615cbd49430baa30ce211faa0",
 		"Cargo.toml": "0911ec61fc6d5218a53ff0f173a1a17debf8714fdd4d1cab1a0ac3fedeea44cf",
 		"README.md": "ce7c932b58d17bb23d788c44adcdcc74f189c61a0f7782332b7879b9c56961cf",
 		"src/lib.rs": "601aba6449c8df0b27e1ff8564797470679c4c4fdb002c94be06b60a72f4a222",
 		"src/bindings/client/org_chromium_authpolicy.rs": "7fdd12522a2cfaee176700c912862f5da0ad0900315417b8f78d61a75ecf968f",
-		"src/bindings/client/org_chromium_sessionmanagerinterface.rs": "6be7e8f322d82144df0006e7170ab6529632d6f065b5bca8fe843655f1ae33b4",
+		"src/bindings/client/org_chromium_sessionmanagerinterface.rs": "8905c3ff5fae2f44d188297f4370b9a20f1c16b071a89d33411962c361edd490",
 		"src/bindings/client/org_chromium_power_manager.rs": "b4f87f9b8b8bde1fe0a6fffc7e603130074e3d141557170d73d6cb217880245c",
 		"src/bindings/client/org_chromium_debugd.rs": "00ff00c1c8653a909ec2b12e94f67c9b6141c9222afe5782625bd4b5cbdd796e",
 		"src/bindings/client/org_chromium_userdataauth.rs": "3e6b1c2ae9d7f7ecd4a1bf7e0dd39507a4e7582afe5914f1b0bb7b3a8687bc11",
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 39cd5c3..d443df7 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
@@ -6101,12 +6101,12 @@
 zephyr/projects/nissa/yaviks/overlay.dts
 zephyr/projects/nissa/yaviks/power_signals.dts
 zephyr/projects/nissa/yaviks/prj.conf
-zephyr/projects/nissa/yaviks/pwm_leds.dts
 zephyr/projects/nissa/yaviks/src
 zephyr/projects/nissa/yaviks/yaviks_vif.xml
 zephyr/projects/nissa/yaviks/src/charger.c
 zephyr/projects/nissa/yaviks/src/hdmi.c
 zephyr/projects/nissa/yaviks/src/keyboard.c
+zephyr/projects/nissa/yaviks/src/led.c
 zephyr/projects/nissa/yaviks/src/usbc.c
 zephyr/projects/npcx_evb/npcx7
 zephyr/projects/npcx_evb/npcx9
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 84a80f6..1b1305f 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
@@ -6100,12 +6100,12 @@
 zephyr/projects/nissa/yaviks/overlay.dts
 zephyr/projects/nissa/yaviks/power_signals.dts
 zephyr/projects/nissa/yaviks/prj.conf
-zephyr/projects/nissa/yaviks/pwm_leds.dts
 zephyr/projects/nissa/yaviks/src
 zephyr/projects/nissa/yaviks/yaviks_vif.xml
 zephyr/projects/nissa/yaviks/src/charger.c
 zephyr/projects/nissa/yaviks/src/hdmi.c
 zephyr/projects/nissa/yaviks/src/keyboard.c
+zephyr/projects/nissa/yaviks/src/led.c
 zephyr/projects/nissa/yaviks/src/usbc.c
 zephyr/projects/npcx_evb/npcx7
 zephyr/projects/npcx_evb/npcx9
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 c7f48dd..54b9170 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
@@ -6100,12 +6100,12 @@
 zephyr/projects/nissa/yaviks/overlay.dts
 zephyr/projects/nissa/yaviks/power_signals.dts
 zephyr/projects/nissa/yaviks/prj.conf
-zephyr/projects/nissa/yaviks/pwm_leds.dts
 zephyr/projects/nissa/yaviks/src
 zephyr/projects/nissa/yaviks/yaviks_vif.xml
 zephyr/projects/nissa/yaviks/src/charger.c
 zephyr/projects/nissa/yaviks/src/hdmi.c
 zephyr/projects/nissa/yaviks/src/keyboard.c
+zephyr/projects/nissa/yaviks/src/led.c
 zephyr/projects/nissa/yaviks/src/usbc.c
 zephyr/projects/npcx_evb/npcx7
 zephyr/projects/npcx_evb/npcx9
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 3740c08..1415553 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
@@ -6101,12 +6101,12 @@
 zephyr/projects/nissa/yaviks/overlay.dts
 zephyr/projects/nissa/yaviks/power_signals.dts
 zephyr/projects/nissa/yaviks/prj.conf
-zephyr/projects/nissa/yaviks/pwm_leds.dts
 zephyr/projects/nissa/yaviks/src
 zephyr/projects/nissa/yaviks/yaviks_vif.xml
 zephyr/projects/nissa/yaviks/src/charger.c
 zephyr/projects/nissa/yaviks/src/hdmi.c
 zephyr/projects/nissa/yaviks/src/keyboard.c
+zephyr/projects/nissa/yaviks/src/led.c
 zephyr/projects/nissa/yaviks/src/usbc.c
 zephyr/projects/npcx_evb/npcx7
 zephyr/projects/npcx_evb/npcx9
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 8d1b504..2deeb95 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(('BREAK', 'AND', 'DIVIDE', 'STATIC', 'STRING_LITERAL', 'RETURN', 'EQUALS', 'PLUSEQUAL', 'CONST', 'ANDEQUAL', 'RPAREN', '__INT128', 'OR', 'TIMESEQUAL', 'INT_CONST_CHAR', 'DO', 'EQ', 'UNSIGNED', 'HEX_FLOAT_CONST', 'UNION', 'MODEQUAL', '_BOOL', 'IF', 'FLOAT', 'SIGNED', 'LNOT', 'SEMI', 'SIZEOF', 'CONDOP', 'ID', 'RBRACE', 'STRUCT', 'RESTRICT', 'INT', 'SHORT', 'LT', 'GT', 'DEFAULT', 'INT_CONST_DEC', 'MINUSEQUAL', 'COMMA', 'PPPRAGMASTR', 'WSTRING_LITERAL', 'WCHAR_CONST', 'DIVEQUAL', 'ENUM', 'GE', 'NE', 'OREQUAL', 'MINUS', 'FOR', 'NOT', 'MOD', 'RBRACKET', 'PPPRAGMA', 'INT_CONST_BIN', 'ELSE', 'CASE', 'EXTERN', 'XOR', 'XOREQUAL', 'MINUSMINUS', '_COMPLEX', 'DOUBLE', 'OFFSETOF', 'INT_CONST_HEX', 'PERIOD', 'AUTO', 'PLUS', 'INT_CONST_OCT', 'LOR', 'ELLIPSIS', 'CONTINUE', 'VOLATILE', 'RSHIFT', 'GOTO', 'LPAREN', 'LSHIFTEQUAL', 'LONG', 'TYPEDEF', 'ARROW', 'LSHIFT', 'SWITCH', 'TYPEID', 'LBRACE', 'WHILE', 'CHAR', 'LBRACKET', 'REGISTER', 'LAND', 'PPHASH', 'VOID', 'RSHIFTEQUAL', 'LE', 'CHAR_CONST', 'PLUSPLUS', 'FLOAT_CONST', 'TIMES', 'COLON', 'INLINE'))
+_lextokens    = set(('MOD', 'GT', 'TIMES', 'RBRACE', 'PLUS', 'REGISTER', 'TIMESEQUAL', 'HEX_FLOAT_CONST', 'FLOAT', 'MODEQUAL', 'RSHIFT', 'LE', 'DO', 'WHILE', '__INT128', 'STATIC', 'INLINE', 'LONG', 'GOTO', 'IF', 'COMMA', 'ARROW', 'ENUM', 'CHAR', 'ANDEQUAL', 'EQ', 'LSHIFT', 'CHAR_CONST', 'VOLATILE', 'PPPRAGMA', 'WCHAR_CONST', 'FOR', 'LNOT', 'GE', 'BREAK', 'SIZEOF', 'NE', '_BOOL', 'ELLIPSIS', 'INT_CONST_CHAR', 'EQUALS', 'UNION', 'OR', 'INT_CONST_DEC', 'INT_CONST_HEX', 'PLUSEQUAL', 'LSHIFTEQUAL', 'PPHASH', 'SIGNED', 'INT_CONST_OCT', 'LOR', 'AND', 'NOT', 'LAND', 'MINUSMINUS', 'AUTO', 'WSTRING_LITERAL', 'DIVEQUAL', 'RETURN', 'OREQUAL', 'ELSE', 'TYPEID', 'SEMI', 'STRUCT', 'OFFSETOF', 'UNSIGNED', 'LBRACKET', 'EXTERN', 'MINUSEQUAL', 'PERIOD', 'XOREQUAL', 'RBRACKET', 'PLUSPLUS', 'FLOAT_CONST', 'SHORT', 'XOR', 'VOID', 'CONST', 'INT', 'DIVIDE', 'ID', '_COMPLEX', 'INT_CONST_BIN', 'COLON', 'MINUS', 'RESTRICT', 'SWITCH', 'RSHIFTEQUAL', 'STRING_LITERAL', 'PPPRAGMASTR', 'DOUBLE', 'RPAREN', 'LBRACE', 'LT', 'CONTINUE', 'TYPEDEF', 'CONDOP', 'DEFAULT', 'CASE', 'LPAREN'))
 _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 c5c2718..f3dd2d9 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 Tue Sep 13 07:11:41 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:24 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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_a" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="power_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="current_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <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" nom="1.8" rsense="0.02" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_a" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" nom="1.2" rsense="0.005" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="1.2" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" nom="0.875" rsense="0.005" base_name="ppvar_vddcr_nb" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_vddcr_nb" nom="0.875" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" nom="0.85" rsense="0.005" base_name="ppvar_vddcr" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="ppvar_vddcr" nom="0.85" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_tcpc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_tcpc" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_ec_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_ec_a" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.005" tags="power_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.005" tags="current_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp950_a" nom="0.95">
+    <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" nom="0.95" rsense="0.005" base_name="pp950_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp950_a" nom="0.95" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_edp" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" rsense="0.002" tags="power_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" rsense="0.002" tags="current_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" nom="0.95" rsense="0.002" base_name="pp950_vddp_s0" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp950_vddp_s0" nom="0.95" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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 838050c..c31b855 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 Tue Sep 13 07:11:52 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:32 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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" nom="20.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_batt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_batt" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.01" tags="power_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.01" tags="current_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" nom="4.2" rsense="0.01" base_name="pp4200_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_g" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_g" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_h1_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_h1_g" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_sys" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" rsense="0.02" tags="power_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" rsense="0.02" tags="current_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" nom="1.8" rsense="0.02" base_name="pp1800_vio18_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_vio18_u" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_ts" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_ts" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" rsense="0.02" tags="power_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" rsense="0.02" tags="current_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" nom="1.8" rsense="0.02" base_name="pp1800_h1_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1800_h1_g" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" rsense="0.02" tags="power_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" rsense="0.02" tags="current_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" nom="1.8" rsense="0.02" base_name="pp1800_ec_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_ec_vcc" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_u" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_u" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_u" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_u" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_u" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_ec_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_ec_g" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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 4298609..1f56100 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 Tue Sep 13 07:11:50 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:30 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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" nom="20.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" nom="8.8" rsense="0.1" base_name="ppvar_batt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_batt" nom="8.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" nom="4.2" rsense="0.1" base_name="pp4200_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_g" nom="4.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" nom="8.8" rsense="0.1" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="8.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_g" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.1" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_h1_g" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_h1_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_h1_g" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" nom="8.8" rsense="0.1" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_sys" nom="8.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_vio18_u" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_vio18_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_vio18_u" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_ts" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_ts" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_h1_g" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_h1_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1800_h1_g" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_ec_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_ec_vcc" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_u" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_u" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_u" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_u" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_u" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ec_g" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_ec_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_ec_g" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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 71fc024..b759918 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 Tue Sep 13 07:11:48 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:29 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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" nom="20.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_batt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_batt" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.01" tags="power_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.01" tags="current_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" nom="4.2" rsense="0.01" base_name="pp4200_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_g" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_g" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" rsense="0.01" tags="power_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" rsense="0.01" tags="current_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" nom="4.2" rsense="0.01" base_name="pp4200_gpu" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp4200_gpu" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_sys" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_core" nom="4.2">
+    <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" rsense="0.01" tags="power_rail" base_name="pp4200_core" nom="4.2">
+    <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" rsense="0.01" tags="current_rail" base_name="pp4200_core" nom="4.2">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_core" nom="4.2">
+    <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" nom="4.2" rsense="0.01" base_name="pp4200_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_core" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_ts" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_ts" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_bc" nom="4.2">
+    <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" rsense="0.01" tags="power_rail" base_name="pp4200_bc" nom="4.2">
+    <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" rsense="0.01" tags="current_rail" base_name="pp4200_bc" nom="4.2">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_bc" nom="4.2">
+    <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" nom="4.2" rsense="0.01" base_name="pp4200_bc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp4200_bc" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_lc" nom="4.2">
+    <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" rsense="0.01" tags="power_rail" base_name="pp4200_lc" nom="4.2">
+    <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" rsense="0.01" tags="current_rail" base_name="pp4200_lc" nom="4.2">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_lc" nom="4.2">
+    <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" nom="4.2" rsense="0.01" base_name="pp4200_lc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_lc" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_hub" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_hub" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_hub" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_hub" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_hub" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_hub" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_lcm" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_lcm" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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 59a1ac0..e86a904 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 Tue Sep 13 07:11:49 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:30 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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <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" nom="20.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_batt" nom="8.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_batt" nom="8.8">
+    <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" nom="8.8" rsense="0.1" base_name="ppvar_batt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_batt" nom="8.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp4200_g" nom="4.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp4200_g" nom="4.2">
+    <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" nom="4.2" rsense="0.1" base_name="pp4200_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_g" nom="4.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_bl" nom="8.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="8.8">
+    <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" nom="8.8" rsense="0.01" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="8.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_g" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_g" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_g" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_g" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.1" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp4200_gpu" nom="4.2">
+    <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" nom="4.2" rsense="0.1" base_name="pp4200_gpu" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp4200_gpu" nom="4.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_sys" nom="8.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="8.8">
+    <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" nom="8.8" rsense="0.1" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_sys" nom="8.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp4200_core" nom="4.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp4200_core" nom="4.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp4200_core" nom="4.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp4200_core" nom="4.2">
+    <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" nom="4.2" rsense="0.1" base_name="pp4200_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_core" nom="4.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_ts" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_ts" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_ts" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_ts" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp4200_bc" nom="4.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp4200_bc" nom="4.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp4200_bc" nom="4.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp4200_bc" nom="4.2">
+    <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" nom="4.2" rsense="0.1" base_name="pp4200_bc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp4200_bc" nom="4.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp4200_lc" nom="4.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp4200_lc" nom="4.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp4200_lc" nom="4.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp4200_lc" nom="4.2">
+    <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" nom="4.2" rsense="0.1" base_name="pp4200_lc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp4200_lc" nom="4.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_hub" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_hub" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_hub" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_hub" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_hub" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_hub" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_lcm" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_lcm" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_lcm" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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 6522866..d5e7b38 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 Tue Sep 13 07:11:38 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:21 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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+<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" rsense="0.002" tags="power_rail" base_name="ppvar_vcc" nom="1.0">
+<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" rsense="0.002" tags="current_rail" base_name="ppvar_vcc" nom="1.0">
+<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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+<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" nom="1.0" rsense="0.002" base_name="ppvar_vcc" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="ppvar_vcc" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvat_gt" nom="1.0">
+<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" rsense="0.002" tags="power_rail" base_name="ppvat_gt" nom="1.0">
+<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" rsense="0.002" tags="current_rail" base_name="ppvat_gt" nom="1.0">
+<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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvat_gt" nom="1.0">
+<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" nom="1.0" rsense="0.002" base_name="ppvat_gt" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="ppvat_gt" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sa" nom="1.0">
+<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" rsense="0.005" tags="power_rail" base_name="ppvar_sa" nom="1.0">
+<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" rsense="0.005" tags="current_rail" base_name="ppvar_sa" nom="1.0">
+<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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_sa" nom="1.0">
+<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" nom="1.0" rsense="0.005" base_name="ppvar_sa" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="ppvar_sa" nom="1.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp975_io" nom="7.7">
+<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" rsense="0.1" tags="power_rail" base_name="pp975_io" nom="7.7">
+<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" rsense="0.1" tags="current_rail" base_name="pp975_io" nom="7.7">
+<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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp975_io" nom="7.7">
+<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" nom="7.7" rsense="0.1" base_name="pp975_io" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp975_io" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+<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" rsense="0.01" tags="power_rail" base_name="pp5000_a" nom="5.0">
+<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" rsense="0.01" tags="current_rail" base_name="pp5000_a" nom="5.0">
+<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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+<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" nom="5.0" rsense="0.01" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+<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" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+<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" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+<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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+<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" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="7.7">
+<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" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="7.7">
+<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" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="7.7">
+<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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="7.7">
+<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" nom="7.7" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_a" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_u_dram" nom="7.7">
+<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" rsense="0.1" tags="power_rail" base_name="pp1800_u_dram" nom="7.7">
+<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" rsense="0.1" tags="current_rail" base_name="pp1800_u_dram" nom="7.7">
+<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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_u_dram" nom="7.7">
+<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" nom="7.7" rsense="0.1" base_name="pp1800_u_dram" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp1800_u_dram" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+<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" rsense="0.1" tags="power_rail" base_name="pp1200_vddq" nom="7.7">
+<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" rsense="0.1" tags="current_rail" base_name="pp1200_vddq" nom="7.7">
+<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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+<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" nom="7.7" rsense="0.1" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_a" nom="7.7">
+<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" rsense="0.1" tags="power_rail" base_name="pp1000_a" nom="7.7">
+<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" rsense="0.1" tags="current_rail" base_name="pp1000_a" nom="7.7">
+<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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_a" nom="7.7">
+<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" nom="7.7" rsense="0.1" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp1000_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+<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" rsense="0.1" tags="power_rail" base_name="pp850_prim_core" nom="7.7">
+<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" rsense="0.1" tags="current_rail" base_name="pp850_prim_core" nom="7.7">
+<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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+<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" nom="7.7" rsense="0.1" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp850_prim_core" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+<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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+<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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+<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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+<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" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.05" tags="bus_voltage_rail" base_name="ppvar_bl_pwr" nom="7.7">
+<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" rsense="0.05" tags="power_rail" base_name="ppvar_bl_pwr" nom="7.7">
+<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" rsense="0.05" tags="current_rail" base_name="ppvar_bl_pwr" nom="7.7">
+<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" rsense="0.05" tags="shunt_voltage_rail" base_name="ppvar_bl_pwr" nom="7.7">
+<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" nom="7.7" rsense="0.05" base_name="ppvar_bl_pwr" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="ppvar_bl_pwr" nom="7.7" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+<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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+<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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+<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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+<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" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_h1" nom="3.3">
+<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" rsense="0.1" tags="power_rail" base_name="pp3300_h1" nom="3.3">
+<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" rsense="0.1" tags="current_rail" base_name="pp3300_h1" nom="3.3">
+<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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_h1" nom="3.3">
+<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" nom="3.3" rsense="0.1" base_name="pp3300_h1" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_h1" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.02" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+<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" rsense="0.02" tags="power_rail" base_name="vbat" nom="7.7">
+<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" rsense="0.02" tags="current_rail" base_name="vbat" nom="7.7">
+<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" rsense="0.02" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+<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" nom="7.7" rsense="0.02" base_name="vbat" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="5" reg_len="2" c2d2_interface="4">
 </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 b7b0ec8..a8abef8 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 Tue Sep 13 07:11:41 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:24 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" rsense="0.1" tags="bus_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp975_io" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp975_io" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp850_prim_core" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_a" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_u" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_h1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_h1" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.05" tags="bus_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="power_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="current_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.05" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="7.7" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_touch" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_touch" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_trackpad" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_trackpad" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dsw_ec" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw_ec" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="vbat" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vcc" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" nom="1.0" rsense="0.005" base_name="ppvar_sa" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sa" nom="1.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_gt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_gt" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dx_trackpad" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dx_trackpad" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_kb_bl" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_cam" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_cam" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_st" nom="1.0">
+    <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" nom="1.0" rsense="0.1" base_name="pp1000_st" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_st" nom="1.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="power_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="current_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp1000_stg" nom="1.0">
+    <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" nom="1.0" rsense="0.5" base_name="pp1000_stg" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_stg" nom="1.0" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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 d42b0b4..c21cab3 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 Tue Sep 13 07:11:47 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:28 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" rsense="0.1" tags="bus_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp975_io" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp975_io" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp850_prim_core" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_a" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_u" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_h1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_h1" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.05" tags="bus_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="power_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="current_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.05" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="7.7" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_touch" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_touch" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_trackpad" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_trackpad" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dsw_ec" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw_ec" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="vbat" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vcc" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" nom="1.0" rsense="0.005" base_name="ppvar_sa" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sa" nom="1.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_gt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_gt" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dx_trackpad" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dx_trackpad" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_kb_bl" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_cam" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_cam" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_st" nom="1.0">
+    <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" nom="1.0" rsense="0.1" base_name="pp1000_st" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_st" nom="1.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="power_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="current_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp1000_stg" nom="1.0">
+    <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" nom="1.0" rsense="0.5" base_name="pp1000_stg" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_stg" nom="1.0" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" nom="1.2" rsense="0.1" base_name="ppvar_nvme" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_nvme" nom="1.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dsw_ec" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dsw_ec" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" nom="1.2" rsense="0.1" base_name="pp1200_pll_oc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_pll_oc" nom="1.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dsw" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="7" reg_len="2" c2d2_interface="4">
     </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 d42b0b4..c21cab3 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 Tue Sep 13 07:11:47 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:28 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" rsense="0.1" tags="bus_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp975_io" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp975_io" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp850_prim_core" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_a" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_u" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_h1" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_h1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_h1" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.05" tags="bus_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="power_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="current_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.05" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="7.7" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_touch" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_touch" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_touch" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_trackpad" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_trackpad" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_trackpad" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dsw_ec" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dsw_ec" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw_ec" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="vbat" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vcc" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" nom="1.0" rsense="0.005" base_name="ppvar_sa" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sa" nom="1.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_gt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_gt" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dx_trackpad" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dx_trackpad" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dx_trackpad" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_kb_bl" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_dx_cam" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_dx_cam" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_cam" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_st" nom="1.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_st" nom="1.0">
+    <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" nom="1.0" rsense="0.1" base_name="pp1000_st" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_st" nom="1.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="power_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="current_rail" base_name="pp1000_stg" nom="1.0">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp1000_stg" nom="1.0">
+    <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" nom="1.0" rsense="0.5" base_name="pp1000_stg" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_stg" nom="1.0" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_nvme" nom="1.2">
+    <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" nom="1.2" rsense="0.1" base_name="ppvar_nvme" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_nvme" nom="1.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dsw_ec" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dsw_ec" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dsw_ec" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_pll_oc" nom="1.2">
+    <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" nom="1.2" rsense="0.1" base_name="pp1200_pll_oc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_pll_oc" nom="1.2" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_dsw" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dsw" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="75" offset="7" reg_len="2" c2d2_interface="4">
     </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 afb2bd4..15ea9f4 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 Tue Sep 13 07:11:51 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:31 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" rsense="0.1" tags="bus_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp975_io" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp975_io" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp850_prim_core" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_a" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_u" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="vbat" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vcc" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" nom="1.0" rsense="0.005" base_name="ppvar_sa" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sa" nom="1.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_gt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_gt" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.05" tags="bus_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="power_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="current_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.05" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="7.7" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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 5be4698..db74ab3 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 Tue Sep 13 07:11:42 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:25 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" rsense="0.1" tags="bus_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp975_io" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp975_io" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp975_io" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp975_io" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp850_prim_core" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_a" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_u" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_u" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1800_u" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_u" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1000_a" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1000_a" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1000_a" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="vbat" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="vbat" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.003" tags="bus_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.003" tags="power_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.003" tags="current_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" rsense="0.003" tags="shunt_voltage_rail" base_name="ppvar_vcc" nom="1.0">
+    <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" nom="1.0" rsense="0.003" base_name="ppvar_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vcc" nom="1.0" map="on" rsense="0.003" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sa" nom="1.0">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_sa" nom="1.0">
+    <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" nom="1.0" rsense="0.005" base_name="ppvar_sa" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sa" nom="1.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.003" tags="bus_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.003" tags="power_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.003" tags="current_rail" base_name="ppvar_gt" nom="1.0">
+    <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" rsense="0.003" tags="shunt_voltage_rail" base_name="ppvar_gt" nom="1.0">
+    <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" nom="1.0" rsense="0.003" base_name="ppvar_gt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_gt" nom="1.0" map="on" rsense="0.003" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.05" tags="bus_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="power_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="current_rail" base_name="ppvar_bl" nom="7.7">
+    <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" rsense="0.05" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <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" nom="7.7" rsense="0.05" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="7.7" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="15.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="15.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="15.0">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="15.0">
+    <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" nom="15.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="15.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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 124ac38..822b3d9 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 Tue Sep 13 07:11:44 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:26 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" rsense="0.1" tags="bus_voltage_rail" base_name="vbat_100mohm" nom="7.7">
+    <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" rsense="0.1" tags="power_rail" base_name="vbat_100mohm" nom="7.7">
+    <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" rsense="0.1" tags="current_rail" base_name="vbat_100mohm" nom="7.7">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="vbat_100mohm" nom="7.7">
+    <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" nom="7.7" rsense="0.1" base_name="vbat_100mohm" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat_100mohm" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat_010mohm" nom="7.7">
+    <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" rsense="0.01" tags="power_rail" base_name="vbat_010mohm" nom="7.7">
+    <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" rsense="0.01" tags="current_rail" base_name="vbat_010mohm" nom="7.7">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat_010mohm" nom="7.7">
+    <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" nom="7.7" rsense="0.01" base_name="vbat_010mohm" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="vbat_010mohm" nom="7.7" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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 1a00865..5669cb6 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 Tue Sep 13 07:11:44 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:26 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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp1800_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp1200_dram" nom="1.2">
+    <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" rsense="0.002" tags="power_rail" base_name="pp1200_dram" nom="1.2">
+    <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" rsense="0.002" tags="current_rail" base_name="pp1200_dram" nom="1.2">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp1200_dram" nom="1.2">
+    <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" nom="1.2" rsense="0.002" base_name="pp1200_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1200_dram" nom="1.2" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp2500_dram" nom="2.5">
+    <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" rsense="0.01" tags="power_rail" base_name="pp2500_dram" nom="2.5">
+    <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" rsense="0.01" tags="current_rail" base_name="pp2500_dram" nom="2.5">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp2500_dram" nom="2.5">
+    <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" nom="2.5" rsense="0.01" base_name="pp2500_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp2500_dram" nom="2.5" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys_qi" nom="20.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys_qi" nom="20.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys_qi" nom="20.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_sys_qi" nom="20.0">
+    <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" nom="20.0" rsense="0.01" base_name="ppvar_sys_qi" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_sys_qi" nom="20.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_ssd_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_s5" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_s5" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_s5" nom="5.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp5000_s5" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp5000_s5" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp5000_z1" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp3300_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.0001" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" rsense="0.0001" tags="power_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" rsense="0.0001" tags="current_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" rsense="0.0001" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" nom="1.0" rsense="0.0001" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_vccin_aux" nom="1.0" map="on" rsense="0.0001" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_z1" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_z1" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_z1" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_z1" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_z1" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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 b3e0c3e..32bea2c 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 Tue Sep 13 07:11:43 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:25 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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp_dx" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp_dx" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp_dx" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_edp_dx" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp_dx" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_edp_dx" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1100_dram" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_fp_x" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="power_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="current_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" nom="1.8" rsense="0.5" base_name="pp1800_fp_sens" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1800_fp_sens" nom="1.8" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp5000_z1" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" nom="1.0">
+    <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" nom="1.0" rsense="0.002" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="ppvar_vccin_aux" nom="1.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_z1" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_z1" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_z1" nom="3.3">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp3300_z1" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_z1" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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 53104b8..efb3e76 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 Tue Sep 13 07:11:48 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:29 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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp3300_ssd_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_ssd_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_ssd_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp3300_ssd_x" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.1" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_gsc_z2" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" rsense="0.1" tags="avg_power_rails" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_gsc_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_gsc_z2" nom="3.3" map="yes" rsense="0.1" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_wlan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_wlan_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_wlan_x" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" map="resolution" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_soc_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_soc_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_soc_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_soc_s5" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" map="resolution" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.005" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_soc_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp1800_soc_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_soc_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_soc_s5" nom="1.8" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" map="resolution" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.0" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp1800_sensor_s5" nom="1.8" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="1.8" rsense="0.0" base_name="pp1800_sensor_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp1800_sensor_s5" nom="1.8" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_seq" nom="3.3">
+    <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" map="resolution" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_seq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_seq" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_seq" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_seq" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_tchpad_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchpad_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_tchpad_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp3300_ec_z2" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_ec_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp3300_ec_z2" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_z1" nom="3.3">
+    <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" map="resolution" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_z1" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_z1" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_usb_z1" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_usb_z1" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_usb_z1" nom="3.3">
+    <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" map="resolution" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.1" base_name="pp3300_usb_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_usb_z1" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" rsense="0.1" tags="avg_power_rails" base_name="pp3300_usb_z1" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_usb_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_usb_z1" nom="3.3" map="yes" rsense="0.1" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="power_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="current_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" map="resolution" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="2.2" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_ec_z1" nom="3.3" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" rsense="2.2" tags="avg_power_rails" base_name="pp3300_ec_z1" nom="3.3">
+    <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" nom="3.3" rsense="2.2" base_name="pp3300_ec_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_ec_z1" nom="3.3" map="yes" rsense="2.2" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="power_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="current_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" map="resolution" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="2.2" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_ec_z1" nom="1.8" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" rsense="2.2" tags="avg_power_rails" base_name="pp1800_ec_z1" nom="1.8">
+    <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" nom="1.8" rsense="2.2" base_name="pp1800_ec_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_ec_z1" nom="1.8" map="yes" rsense="2.2" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_wwan_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_wwan_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_wwan_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_wwan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_wwan_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_wwan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_wwan_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_wwan_x" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_hdmi_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_hdmi_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_hdmi_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" map="resolution" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.01" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp5000_hdmi_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_hdmi_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp5000_hdmi_x" nom="5.0" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sys_edp" nom="9.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sys_edp" nom="9.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sys_edp" nom="9.0">
+    <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" map="resolution" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.005" base_name="ppvar_sys_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="ppvar_sys_edp" nom="9.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="ppvar_sys_edp" nom="9.0">
+    <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" nom="9.0" rsense="0.005" base_name="ppvar_sys_edp" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="ppvar_sys_edp" nom="9.0" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_edp_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_edp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_edp_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_fcam_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_fcam_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_fcam_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_fcam_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_fcam_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_fcam_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_fcam_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_fcam_x" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_hps_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_hps_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_hps_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_hps_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_hps_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_hps_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_hps_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_hps_x" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" map="resolution" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp3300_sensor_s5" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_sensor_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp3300_sensor_s5" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_tchscr_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchscr_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_tchscr_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_s5" nom="1.8">
+    <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" map="resolution" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp1800_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp1800_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp1800_s5" nom="1.8" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp5000_fan" nom="5.0">
+    <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" map="resolution" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.0" base_name="pp5000_fan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp5000_fan" nom="5.0" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="5.0" rsense="0.0" base_name="pp5000_fan" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp5000_fan" nom="5.0" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="power_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="current_rail" base_name="pp1800_dram" nom="1.8">
+    <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" map="resolution" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_dram" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp1800_dram" nom="1.8">
+    <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" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_dram" nom="1.8" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="pp1100_dram" nom="1.1">
+    <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" map="resolution" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="resolution">
     </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" map="yesno" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="yesno">
     </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" map="pac_samples" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="pac_samples">
     </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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp1100_dram" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" rsense="0.002" tags="avg_power_rails" base_name="pp1100_dram" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp1100_dram" nom="1.1" map="yes" rsense="0.002" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="power_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="current_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" map="resolution" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="resolution">
     </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" map="yesno" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="yesno">
     </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" map="pac_samples" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="pac_samples">
     </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" nom="0.6" rsense="0.005" base_name="pp0600_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp0600_vddq" nom="0.6" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp0600_vddq" nom="0.6">
+    <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" nom="0.6" rsense="0.005" base_name="pp0600_vddq" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp0600_vddq" nom="0.6" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" map="resolution" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.002" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="ppvar_vccin_aux" nom="9.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" rsense="0.002" tags="avg_power_rails" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" nom="9.0" rsense="0.002" base_name="ppvar_vccin_aux" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="ppvar_vccin_aux" nom="9.0" map="yes" rsense="0.002" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" map="resolution" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.01" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp5000_tchpad_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_tchpad_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp5000_tchpad_x" nom="5.0" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_rtc_z2" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_rtc_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_rtc_z2" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_z2" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_s5" nom="3.3">
+    <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" map="resolution" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_s5" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_z1" nom="5.0">
+    <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" map="resolution" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.002" base_name="pp5000_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp5000_z1" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" rsense="0.002" tags="avg_power_rails" base_name="pp5000_z1" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp5000_z1" nom="5.0" map="yes" rsense="0.002" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys_sd" nom="9.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys_sd" nom="9.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys_sd" nom="9.0">
+    <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" map="resolution" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.01" base_name="ppvar_sys_sd" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="ppvar_sys_sd" nom="9.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="ppvar_sys_sd" nom="9.0">
+    <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" nom="9.0" rsense="0.01" base_name="ppvar_sys_sd" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="ppvar_sys_sd" nom="9.0" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_s5_sd" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_s5_sd" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_s5_sd" nom="3.3">
+    <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" map="resolution" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_s5_sd" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_s5_sd" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_s5_sd" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_s5_sd" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_s5_sd" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_kb_bl" nom="9.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_kb_bl" nom="9.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_kb_bl" nom="9.0">
+    <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" map="resolution" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.02" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="ppvar_kb_bl" nom="9.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="ppvar_kb_bl" nom="9.0">
+    <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" nom="9.0" rsense="0.02" base_name="ppvar_kb_bl" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="ppvar_kb_bl" nom="9.0" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="power_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="current_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" map="resolution" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.5" base_name="pp1800_fp_sens" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_fp_sens" nom="1.8" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" rsense="0.5" tags="avg_power_rails" base_name="pp1800_fp_sens" nom="1.8">
+    <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" nom="1.8" rsense="0.5" base_name="pp1800_fp_sens" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_fp_sens" nom="1.8" map="yes" rsense="0.5" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.5" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_fp_x" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" rsense="0.5" tags="avg_power_rails" base_name="pp3300_fp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_fp_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_fp_x" nom="3.3" map="yes" rsense="0.5" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.001" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="9.0">
+    <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" rsense="0.001" tags="power_rail" base_name="ppvar_vbus_in" nom="9.0">
+    <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" rsense="0.001" tags="current_rail" base_name="ppvar_vbus_in" nom="9.0">
+    <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" map="resolution" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.001" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="ppvar_vbus_in" nom="9.0" map="on" rsense="0.001" tags="adc_ez_config_ctrls">
     </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" rsense="0.001" tags="avg_power_rails" base_name="ppvar_vbus_in" nom="9.0">
+    <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" nom="9.0" rsense="0.001" base_name="ppvar_vbus_in" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="ppvar_vbus_in" nom="9.0" map="yes" rsense="0.001" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" map="resolution" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_adc_dbg" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_adc_dbg" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_adc_dbg" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_adc_dbg" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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 53104b8..efb3e76 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 Tue Sep 13 07:11:48 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:29 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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp3300_ssd_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_ssd_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_ssd_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp3300_ssd_x" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_ssd_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.1" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_gsc_z2" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" rsense="0.1" tags="avg_power_rails" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_gsc_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_gsc_z2" nom="3.3" map="yes" rsense="0.1" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_gsc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_wlan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_wlan_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_wlan_x" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_wlan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" map="resolution" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_soc_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_soc_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_soc_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_soc_s5" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_soc_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="16" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="16" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="16" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="16" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="16" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="16" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" map="resolution" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.005" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_soc_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp1800_soc_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_soc_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_soc_s5" nom="1.8" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_soc_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" map="resolution" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.0" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp1800_sensor_s5" nom="1.8" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="1.8" rsense="0.0" base_name="pp1800_sensor_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp1800_sensor_s5" nom="1.8" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_sensor_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_seq" nom="3.3">
+    <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" map="resolution" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_seq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_seq" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_seq" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_seq" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_seq" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_seq" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_tchpad_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchpad_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_tchpad_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_tchpad_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="17" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="17" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="17" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="17" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="17" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="17" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp3300_ec_z2" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_ec_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp3300_ec_z2" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_ec_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_z1" nom="3.3">
+    <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" map="resolution" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_z1" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_z1" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_z1" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_usb_z1" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_usb_z1" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_usb_z1" nom="3.3">
+    <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" map="resolution" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.1" base_name="pp3300_usb_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_usb_z1" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" rsense="0.1" tags="avg_power_rails" base_name="pp3300_usb_z1" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_usb_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_usb_z1" nom="3.3" map="yes" rsense="0.1" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_usb_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="power_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="current_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" map="resolution" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="2.2" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_ec_z1" nom="3.3" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" rsense="2.2" tags="avg_power_rails" base_name="pp3300_ec_z1" nom="3.3">
+    <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" nom="3.3" rsense="2.2" base_name="pp3300_ec_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_ec_z1" nom="3.3" map="yes" rsense="2.2" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_ec_z1" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="18" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="18" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="18" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="18" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="18" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="18" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="power_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="current_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" map="resolution" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="2.2" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_ec_z1" nom="1.8" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" rsense="2.2" tags="avg_power_rails" base_name="pp1800_ec_z1" nom="1.8">
+    <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" nom="1.8" rsense="2.2" base_name="pp1800_ec_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_ec_z1" nom="1.8" map="yes" rsense="2.2" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_ec_z1" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_wwan_x" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_wwan_x" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_wwan_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_wwan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_wwan_x" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_wwan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_wwan_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_wwan_x" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_wwan_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_hdmi_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_hdmi_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_hdmi_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_hdmi_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" map="resolution" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.01" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp5000_hdmi_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_hdmi_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp5000_hdmi_x" nom="5.0" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_hdmi_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="19" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="19" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="19" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="19" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="19" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="19" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_sys_edp" nom="9.0">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_sys_edp" nom="9.0">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_sys_edp" nom="9.0">
+    <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" map="resolution" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.005" base_name="ppvar_sys_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="ppvar_sys_edp" nom="9.0" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="ppvar_sys_edp" nom="9.0">
+    <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" nom="9.0" rsense="0.005" base_name="ppvar_sys_edp" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="ppvar_sys_edp" nom="9.0" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_sys_edp" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_edp_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_edp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_edp_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_edp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_edp_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_fcam_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_fcam_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_fcam_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_fcam_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_fcam_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_fcam_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_fcam_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_fcam_x" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_fcam_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_hps_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_hps_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_hps_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_hps_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_hps_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_hps_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_hps_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_hps_x" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_hps_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_hps_x" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="20" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="20" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="20" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="20" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="20" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="20" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" map="resolution" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp3300_sensor_s5" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_sensor_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp3300_sensor_s5" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_sensor_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.02" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_tchscr_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchscr_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_tchscr_x" nom="3.3" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_tchscr_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_s5" nom="1.8">
+    <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" map="resolution" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp1800_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp1800_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp1800_s5" nom="1.8" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_s5" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp1800_s5" rsense="0.005" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp5000_fan" nom="5.0">
+    <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" map="resolution" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.0" base_name="pp5000_fan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp5000_fan" nom="5.0" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="5.0" rsense="0.0" base_name="pp5000_fan" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp5000_fan" nom="5.0" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_fan" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_fan" rsense="0.0" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="21" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="21" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="21" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="21" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="21" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="21" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="power_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="current_rail" base_name="pp1800_dram" nom="1.8">
+    <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" map="resolution" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_dram" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp1800_dram" nom="1.8">
+    <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" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_dram" nom="1.8" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_dram" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_dram" rsense="0.01" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="pp1100_dram" nom="1.1">
+    <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" map="resolution" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="resolution">
     </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" map="yesno" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="yesno">
     </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" map="pac_samples" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="pac_samples">
     </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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp1100_dram" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" rsense="0.002" tags="avg_power_rails" base_name="pp1100_dram" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp1100_dram" nom="1.1" map="yes" rsense="0.002" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1100_dram" nom="1.1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1100_dram" rsense="0.002" nom="1.1" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="power_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="current_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" map="resolution" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="resolution">
     </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" map="yesno" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="yesno">
     </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" map="pac_samples" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="pac_samples">
     </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" nom="0.6" rsense="0.005" base_name="pp0600_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp0600_vddq" nom="0.6" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp0600_vddq" nom="0.6">
+    <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" nom="0.6" rsense="0.005" base_name="pp0600_vddq" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp0600_vddq" nom="0.6" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp0600_vddq" nom="0.6">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp0600_vddq" rsense="0.005" nom="0.6" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" map="resolution" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.002" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="ppvar_vccin_aux" nom="9.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" rsense="0.002" tags="avg_power_rails" base_name="ppvar_vccin_aux" nom="9.0">
+    <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" nom="9.0" rsense="0.002" base_name="ppvar_vccin_aux" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="ppvar_vccin_aux" nom="9.0" map="yes" rsense="0.002" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_vccin_aux" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="22" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="22" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="22" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="22" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="22" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="22" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" map="resolution" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.01" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp5000_tchpad_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_tchpad_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp5000_tchpad_x" nom="5.0" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_tchpad_x" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.0" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_rtc_z2" nom="3.3" map="on" rsense="0.0" tags="adc_ez_config_ctrls">
     </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" nom="3.3" rsense="0.0" base_name="pp3300_rtc_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_rtc_z2" nom="3.3" map="yes" rsense="0.0" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_rtc_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_z2" nom="3.3">
+    <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" map="resolution" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_z2" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_z2" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_z2" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_z2" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_s5" nom="3.3">
+    <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" map="resolution" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" rsense="0.005" tags="avg_power_rails" base_name="pp3300_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_s5" nom="3.3" map="yes" rsense="0.005" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_s5" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_s5" rsense="0.005" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="23" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="23" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="23" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="23" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="23" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="23" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_z1" nom="5.0">
+    <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" map="resolution" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="resolution">
     </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" map="yesno" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="yesno">
     </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" map="pac_samples" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="pac_samples">
     </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" nom="5.0" rsense="0.002" base_name="pp5000_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp5000_z1" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" rsense="0.002" tags="avg_power_rails" base_name="pp5000_z1" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_z1" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp5000_z1" nom="5.0" map="yes" rsense="0.002" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp5000_z1" nom="5.0">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_z1" rsense="0.002" nom="5.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys_sd" nom="9.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys_sd" nom="9.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys_sd" nom="9.0">
+    <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" map="resolution" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.01" base_name="ppvar_sys_sd" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="ppvar_sys_sd" nom="9.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="ppvar_sys_sd" nom="9.0">
+    <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" nom="9.0" rsense="0.01" base_name="ppvar_sys_sd" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="ppvar_sys_sd" nom="9.0" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_sys_sd" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_s5_sd" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_s5_sd" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_s5_sd" nom="3.3">
+    <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" map="resolution" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_s5_sd" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="pp3300_s5_sd" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_s5_sd" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_s5_sd" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="pp3300_s5_sd" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_s5_sd" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_kb_bl" nom="9.0">
+    <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" rsense="0.02" tags="power_rail" base_name="ppvar_kb_bl" nom="9.0">
+    <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" rsense="0.02" tags="current_rail" base_name="ppvar_kb_bl" nom="9.0">
+    <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" map="resolution" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.02" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="ppvar_kb_bl" nom="9.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" rsense="0.02" tags="avg_power_rails" base_name="ppvar_kb_bl" nom="9.0">
+    <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" nom="9.0" rsense="0.02" base_name="ppvar_kb_bl" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="ppvar_kb_bl" nom="9.0" map="yes" rsense="0.02" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_kb_bl" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="24" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="24" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="24" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="24" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="24" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="24" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="power_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" rsense="0.5" tags="current_rail" base_name="pp1800_fp_sens" nom="1.8">
+    <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" map="resolution" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="resolution">
     </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" map="yesno" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="yesno">
     </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" map="pac_samples" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="pac_samples">
     </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" nom="1.8" rsense="0.5" base_name="pp1800_fp_sens" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" base_name="pp1800_fp_sens" nom="1.8" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" rsense="0.5" tags="avg_power_rails" base_name="pp1800_fp_sens" nom="1.8">
+    <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" nom="1.8" rsense="0.5" base_name="pp1800_fp_sens" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" base_name="pp1800_fp_sens" nom="1.8" map="yes" rsense="0.5" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp1800_fp_sens" nom="1.8">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="3" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="15" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="19" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="19" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="23" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="23" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" map="resolution" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.5" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" base_name="pp3300_fp_x" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" rsense="0.5" tags="avg_power_rails" base_name="pp3300_fp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_fp_x" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" base_name="pp3300_fp_x" nom="3.3" map="yes" rsense="0.5" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_fp_x" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_fp_x" rsense="0.5" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="4" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="16" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="16" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="20" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="20" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="24" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="24" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.001" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="9.0">
+    <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" rsense="0.001" tags="power_rail" base_name="ppvar_vbus_in" nom="9.0">
+    <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" rsense="0.001" tags="current_rail" base_name="ppvar_vbus_in" nom="9.0">
+    <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" map="resolution" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="resolution">
     </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" map="yesno" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="yesno">
     </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" map="pac_samples" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="pac_samples">
     </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" nom="9.0" rsense="0.001" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" base_name="ppvar_vbus_in" nom="9.0" map="on" rsense="0.001" tags="adc_ez_config_ctrls">
     </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" rsense="0.001" tags="avg_power_rails" base_name="ppvar_vbus_in" nom="9.0">
+    <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" nom="9.0" rsense="0.001" base_name="ppvar_vbus_in" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" base_name="ppvar_vbus_in" nom="9.0" map="yes" rsense="0.001" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="ppvar_vbus_in" nom="9.0">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="5" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="17" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="17" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="21" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="21" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="25" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="25" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" map="resolution" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="resolution">
     </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" map="yesno" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="yesno">
     </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" map="pac_samples" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="pac_samples">
     </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" nom="3.3" rsense="0.01" base_name="pp3300_adc_dbg" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" base_name="pp3300_adc_dbg" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" rsense="0.01" tags="avg_power_rails" base_name="pp3300_adc_dbg" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_adc_dbg" tags="accum_clear_ctrls">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" base_name="pp3300_adc_dbg" nom="3.3" map="yes" rsense="0.01" tags="accum_clear_ctrls">
     </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" map="yesno" base_name="pp3300_adc_dbg" nom="3.3">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3" map="yesno">
     </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" fmt="hex" map="refresh" offset="0" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="0" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="1" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="3" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="2" reg_len="3" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="6" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="6" reg_len="6" c2d2_interface="4">
     </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" fmt="hex" offset="18" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="18" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="22" reg_len="2" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="22" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="26" reg_len="4" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="26" reg_len="4" c2d2_interface="4">
     </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" fmt="hex" offset="29" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="29" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" map="refresh" offset="31" c2d2_interface="4" reg_len="0" write_only="" addr="25" no_read="">
+    <params interface="2" drv="i2c_reg_drv" no_read="" fmt="hex" addr="25" offset="31" map="refresh" reg_len="0" write_only="" c2d2_interface="4">
     </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" fmt="hex" offset="33" reg_len="1" addr="25" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="25" offset="33" reg_len="1" c2d2_interface="4">
     </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" fmt="hex" offset="35" reg_len="1" addr="25" read_only="" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" read_only="" addr="25" offset="35" reg_len="1" c2d2_interface="4">
     </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 36e0db9..fcdd0a5 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 Tue Sep 13 07:11:44 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:26 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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vccin_aux" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.01" tags="power_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.01" tags="current_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.01" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_soc_s5" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_soc_s5" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_rtc_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="power_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="current_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <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" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dram" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1100_dram" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="power_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="current_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" nom="0.6" rsense="0.005" base_name="pp0600_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp0600_vddq" nom="0.6" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ssd_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_wwan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_wwan_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_sensor_s5" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_hdmi_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_hdmi_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="power_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="current_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="shunt_voltage_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" nom="3.3" rsense="2.2" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ec_z1" nom="3.3" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ec_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="power_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="current_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="shunt_voltage_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" nom="1.8" rsense="2.2" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_ec_z1" nom="1.8" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_ec_vref_peci" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_ec_vref_peci" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_b" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_b" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_b" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_b" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_b" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_b" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_edp_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_sensor_s5" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_tchscr_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_tchpad_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_tchpad_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" nom="5.0" rsense="0.1" base_name="pp5000_fan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_fan_x" nom="5.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_z1" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sys" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="7" reg_len="2" c2d2_interface="4">
     </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 cd6ac1d..e577e49 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 Tue Sep 13 07:11:51 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:31 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" rsense="0.002" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vccin_aux" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.01" tags="power_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.01" tags="current_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1800_soc_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.01" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_soc_s5" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_soc_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_soc_s5" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_rtc_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_rtc_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="power_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="current_rail" base_name="pp1800_dram" nom="1.8">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <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" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_dram" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="power_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="current_rail" base_name="pp1100_dram" nom="1.1">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp1100_dram" nom="1.1">
+    <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" nom="1.1" rsense="0.002" base_name="pp1100_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1100_dram" nom="1.1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="power_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="current_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp0600_vddq" nom="0.6">
+    <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" nom="0.6" rsense="0.005" base_name="pp0600_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp0600_vddq" nom="0.6" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_ssd_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ssd_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_wwan_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_wwan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_wwan_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" rsense="0.1" tags="power_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" rsense="0.1" tags="current_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp1800_sensor_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.1" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_sensor_s5" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_hdmi_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_hdmi_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_hdmi_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_hdmi_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="power_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="current_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" rsense="2.2" tags="shunt_voltage_rail" base_name="pp3300_ec_z1" nom="3.3">
+    <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" nom="3.3" rsense="2.2" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ec_z1" nom="3.3" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ec_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="2.2" tags="bus_voltage_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="power_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="current_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" rsense="2.2" tags="shunt_voltage_rail" base_name="pp1800_ec_z1" nom="1.8">
+    <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" nom="1.8" rsense="2.2" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_ec_z1" nom="1.8" map="on" rsense="2.2" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_ec_vref_peci" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_ec_vref_peci" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_ec_vref_peci" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_b" nom="5.0">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_b" nom="5.0">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_b" nom="5.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_b" nom="5.0">
+    <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" nom="5.0" rsense="0.1" base_name="ppvar_b" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_b" nom="5.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_edp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_edp_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" rsense="0.1" tags="power_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" rsense="0.1" tags="current_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp3300_sensor_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.1" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_sensor_s5" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_tchscr_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_tchscr_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_tchpad_x" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_tchpad_x" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_tchpad_x" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_tchpad_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_kb_bl" nom="5.0">
+    <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" rsense="0.1" tags="power_rail" base_name="ppvar_kb_bl" nom="5.0">
+    <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" rsense="0.1" tags="current_rail" base_name="ppvar_kb_bl" nom="5.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" nom="5.0">
+    <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" nom="5.0" rsense="0.1" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_kb_bl" nom="5.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" rsense="0.1" tags="power_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" rsense="0.1" tags="current_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" rsense="0.1" tags="shunt_voltage_rail" base_name="pp5000_fan_x" nom="5.0">
+    <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" nom="5.0" rsense="0.1" base_name="pp5000_fan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_fan_x" nom="5.0" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1800_s5" nom="1.8">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1800_s5" nom="1.8">
+    <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" nom="1.8" rsense="0.005" base_name="pp1800_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_s5" nom="1.8" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="power_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="current_rail" base_name="pp3300_s5" nom="3.3">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp3300_s5" nom="3.3">
+    <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" nom="3.3" rsense="0.005" base_name="pp3300_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_s5" nom="3.3" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="pp5000_z1" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_z1" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="pp5000_z1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_z1" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys" nom="5.0">
+    <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" rsense="0.01" tags="power_rail" base_name="ppvar_sys" nom="5.0">
+    <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" rsense="0.01" tags="current_rail" base_name="ppvar_sys" nom="5.0">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="5.0">
+    <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" nom="5.0" rsense="0.01" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sys" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" addr="71" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.5" tags="bus_voltage_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="power_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="current_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" rsense="0.5" tags="shunt_voltage_rail" base_name="pp3300_fp_x" nom="3.3">
+    <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" nom="3.3" rsense="0.5" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_fp_x" nom="3.3" map="on" rsense="0.5" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" addr="71" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.01" tags="power_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.01" tags="current_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <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" nom="3.3" rsense="0.01" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_gsc_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="7" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" addr="71" offset="7" reg_len="2" c2d2_interface="4">
     </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 3fa9a50..bd5810e 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 Tue Sep 13 07:11:50 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:30 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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_a" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.02" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.02" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.02" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="power_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="current_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <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" nom="1.8" rsense="0.02" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_a" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" nom="1.2" rsense="0.005" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="1.2" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" nom="0.875" rsense="0.005" base_name="ppvar_vddcr_nb" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_vddcr_nb" nom="0.875" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" nom="0.85" rsense="0.005" base_name="ppvar_vddcr" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="ppvar_vddcr" nom="0.85" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.51" tags="bus_voltage_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.51" tags="power_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.51" tags="current_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.51" tags="shunt_voltage_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" nom="3.3" rsense="0.51" base_name="pp3300_tcpc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_tcpc" nom="3.3" map="on" rsense="0.51" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.51" tags="bus_voltage_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.51" tags="power_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.51" tags="current_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.51" tags="shunt_voltage_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" nom="3.3" rsense="0.51" base_name="pp3300_ec_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_ec_a" nom="3.3" map="on" rsense="0.51" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.02" tags="power_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.02" tags="current_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp950_a" nom="0.95">
+    <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" nom="0.95" rsense="0.02" base_name="pp950_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp950_a" nom="0.95" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_edp" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp950_vddp_s0" rsense="0.01" 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" rsense="0.01" tags="power_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp950_vddp_s0" rsense="0.01" 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" rsense="0.01" tags="current_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp950_vddp_s0" rsense="0.01" 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" rsense="0.01" tags="shunt_voltage_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp950_vddp_s0" rsense="0.01" 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" nom="0.95" rsense="0.01" base_name="pp950_vddp_s0" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp950_vddp_s0" nom="0.95" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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_r1_inas.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r1_inas.xml
index 64fa6e0..73bd91b 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r1_inas.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r1_inas.xml
@@ -1,655 +1,655 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Tue Sep 13 07:11:45 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:27 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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_a" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_a" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.002" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.002" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <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" nom="5.0" rsense="0.002" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="power_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="current_rail" base_name="pp1800_a" nom="1.8">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <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" nom="1.8" rsense="0.02" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_a" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="power_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="current_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <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" nom="1.2" rsense="0.005" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp1200_vddq" nom="1.2" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_vddcr_nb" nom="0.875">
+    <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" nom="0.875" rsense="0.005" base_name="ppvar_vddcr_nb" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="ppvar_vddcr_nb" nom="0.875" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="power_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="current_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="ppvar_vddcr" nom="0.85">
+    <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" nom="0.85" rsense="0.005" base_name="ppvar_vddcr" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="ppvar_vddcr" nom="0.85" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.51" tags="bus_voltage_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.51" tags="power_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.51" tags="current_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" rsense="0.51" tags="shunt_voltage_rail" base_name="pp3300_tcpc" nom="3.3">
+    <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" nom="3.3" rsense="0.51" base_name="pp3300_tcpc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_tcpc" nom="3.3" map="on" rsense="0.51" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.51" tags="bus_voltage_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.51" tags="power_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.51" tags="current_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" rsense="0.51" tags="shunt_voltage_rail" base_name="pp3300_ec_a" nom="3.3">
+    <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" nom="3.3" rsense="0.51" base_name="pp3300_ec_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_ec_a" nom="3.3" map="on" rsense="0.51" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.005" tags="bus_voltage_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.005" tags="power_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.005" tags="current_rail" base_name="pp950_a" nom="0.95">
+    <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" rsense="0.005" tags="shunt_voltage_rail" base_name="pp950_a" nom="0.95">
+    <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" nom="0.95" rsense="0.005" base_name="pp950_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp950_a" nom="0.95" map="on" rsense="0.005" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="power_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="current_rail" base_name="pp3300_edp" nom="3.3">
+    <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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_edp" nom="3.3">
+    <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" nom="3.3" rsense="0.02" base_name="pp3300_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_edp" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.002" tags="bus_voltage_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" rsense="0.002" tags="power_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" rsense="0.002" tags="current_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" rsense="0.002" tags="shunt_voltage_rail" base_name="pp950_vddp_s0" nom="0.95">
+    <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" nom="0.95" rsense="0.002" base_name="pp950_vddp_s0" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp950_vddp_s0" nom="0.95" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/caroline_evt_loc.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/caroline_evt_loc.xml
index b73cc81..c392830 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/caroline_evt_loc.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/caroline_evt_loc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Tue Sep 13 07:11:40 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:22 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
@@ -22,1057 +22,1057 @@
 <control>
 <name>cpu_gt_mv</name>
 <doc>Bus Voltage of 'cpu_gt' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.002" tags="bus_voltage_rail" base_name="cpu_gt" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="cpu_gt" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_gt_mw</name>
 <doc>Power of 'cpu_gt' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.002" tags="power_rail" base_name="cpu_gt" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="cpu_gt" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_gt_ma</name>
 <doc>Current of 'cpu_gt' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.002" tags="current_rail" base_name="cpu_gt" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="cpu_gt" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_gt_shuntmv</name>
 <doc>Shunt Voltage of 'cpu_gt' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.002" tags="shunt_voltage_rail" base_name="cpu_gt" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="cpu_gt" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_gt_ez_config</name>
 <doc>Good default config for 'cpu_gt' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1" rsense="0.002" base_name="cpu_gt" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="cpu_gt" nom="1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>cpu_gt_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_gt_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_gt_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_gt_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_gt_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_gt_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
 </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" rsense="0.01" tags="bus_voltage_rail" base_name="vbat" nom="7.6">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.01" nom="7.6">
 </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" rsense="0.01" tags="power_rail" base_name="vbat" nom="7.6">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.01" nom="7.6">
 </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" rsense="0.01" tags="current_rail" base_name="vbat" nom="7.6">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.01" nom="7.6">
 </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" rsense="0.01" tags="shunt_voltage_rail" base_name="vbat" nom="7.6">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.01" nom="7.6">
 </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" nom="7.6" rsense="0.01" base_name="vbat" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="vbat" nom="7.6" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
 </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
 </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vdd_lcd_mv</name>
 <doc>Bus Voltage of 'vdd_lcd' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.002" tags="bus_voltage_rail" base_name="vdd_lcd" nom="24">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vdd_lcd" rsense="0.002" nom="24">
 </params>
 </control>
 <control>
 <name>vdd_lcd_mw</name>
 <doc>Power of 'vdd_lcd' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.002" tags="power_rail" base_name="vdd_lcd" nom="24">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="vdd_lcd" rsense="0.002" nom="24">
 </params>
 </control>
 <control>
 <name>vdd_lcd_ma</name>
 <doc>Current of 'vdd_lcd' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.002" tags="current_rail" base_name="vdd_lcd" nom="24">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="vdd_lcd" rsense="0.002" nom="24">
 </params>
 </control>
 <control>
 <name>vdd_lcd_shuntmv</name>
 <doc>Shunt Voltage of 'vdd_lcd' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.002" tags="shunt_voltage_rail" base_name="vdd_lcd" nom="24">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vdd_lcd" rsense="0.002" nom="24">
 </params>
 </control>
 <control>
 <name>vdd_lcd_ez_config</name>
 <doc>Good default config for 'vdd_lcd' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="24" rsense="0.002" base_name="vdd_lcd" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="vdd_lcd" nom="24" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>vdd_lcd_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vdd_lcd_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vdd_lcd_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vdd_lcd_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vdd_lcd_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vdd_lcd_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_mv</name>
 <doc>Bus Voltage of 'p1.8v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.1" tags="bus_voltage_rail" base_name="p1.8v_alw" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p1.8v_alw" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_mw</name>
 <doc>Power of 'p1.8v_alw' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.1" tags="power_rail" base_name="p1.8v_alw" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p1.8v_alw" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_ma</name>
 <doc>Current of 'p1.8v_alw' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.1" tags="current_rail" base_name="p1.8v_alw" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p1.8v_alw" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_shuntmv</name>
 <doc>Shunt Voltage of 'p1.8v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.1" tags="shunt_voltage_rail" base_name="p1.8v_alw" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p1.8v_alw" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_ez_config</name>
 <doc>Good default config for 'p1.8v_alw' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1.8" rsense="0.1" base_name="p1.8v_alw" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p1.8v_alw" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_alw_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_mv</name>
 <doc>Bus Voltage of 'p1.8v_mem' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.1" tags="bus_voltage_rail" base_name="p1.8v_mem" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p1.8v_mem" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_mw</name>
 <doc>Power of 'p1.8v_mem' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.1" tags="power_rail" base_name="p1.8v_mem" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p1.8v_mem" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_ma</name>
 <doc>Current of 'p1.8v_mem' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.1" tags="current_rail" base_name="p1.8v_mem" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p1.8v_mem" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_shuntmv</name>
 <doc>Shunt Voltage of 'p1.8v_mem' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.1" tags="shunt_voltage_rail" base_name="p1.8v_mem" nom="1.8">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p1.8v_mem" rsense="0.1" nom="1.8">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_ez_config</name>
 <doc>Good default config for 'p1.8v_mem' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1.8" rsense="0.1" base_name="p1.8v_mem" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p1.8v_mem" nom="1.8" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.8v_mem_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_mv</name>
 <doc>Bus Voltage of 'p1.2v_aux' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.007" tags="bus_voltage_rail" base_name="p1.2v_aux" nom="1.2">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p1.2v_aux" rsense="0.007" nom="1.2">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_mw</name>
 <doc>Power of 'p1.2v_aux' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.007" tags="power_rail" base_name="p1.2v_aux" nom="1.2">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p1.2v_aux" rsense="0.007" nom="1.2">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_ma</name>
 <doc>Current of 'p1.2v_aux' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.007" tags="current_rail" base_name="p1.2v_aux" nom="1.2">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p1.2v_aux" rsense="0.007" nom="1.2">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_shuntmv</name>
 <doc>Shunt Voltage of 'p1.2v_aux' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.007" tags="shunt_voltage_rail" base_name="p1.2v_aux" nom="1.2">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p1.2v_aux" rsense="0.007" nom="1.2">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_ez_config</name>
 <doc>Good default config for 'p1.2v_aux' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1.2" rsense="0.007" base_name="p1.2v_aux" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p1.2v_aux" nom="1.2" map="on" rsense="0.007" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.2v_aux_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_mv</name>
 <doc>Bus Voltage of 'p3.3v_dsw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.1" tags="bus_voltage_rail" base_name="p3.3v_dsw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p3.3v_dsw" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_mw</name>
 <doc>Power of 'p3.3v_dsw' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.1" tags="power_rail" base_name="p3.3v_dsw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p3.3v_dsw" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_ma</name>
 <doc>Current of 'p3.3v_dsw' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.1" tags="current_rail" base_name="p3.3v_dsw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p3.3v_dsw" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_shuntmv</name>
 <doc>Shunt Voltage of 'p3.3v_dsw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.1" tags="shunt_voltage_rail" base_name="p3.3v_dsw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p3.3v_dsw" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_ez_config</name>
 <doc>Good default config for 'p3.3v_dsw' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.1" base_name="p3.3v_dsw" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p3.3v_dsw" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_mv</name>
 <doc>Bus Voltage of 'p5.0v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.015" tags="bus_voltage_rail" base_name="p5.0v_alw" nom="5">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p5.0v_alw" rsense="0.015" nom="5">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_mw</name>
 <doc>Power of 'p5.0v_alw' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.015" tags="power_rail" base_name="p5.0v_alw" nom="5">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p5.0v_alw" rsense="0.015" nom="5">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_ma</name>
 <doc>Current of 'p5.0v_alw' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.015" tags="current_rail" base_name="p5.0v_alw" nom="5">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p5.0v_alw" rsense="0.015" nom="5">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_shuntmv</name>
 <doc>Shunt Voltage of 'p5.0v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.015" tags="shunt_voltage_rail" base_name="p5.0v_alw" nom="5">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p5.0v_alw" rsense="0.015" nom="5">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_ez_config</name>
 <doc>Good default config for 'p5.0v_alw' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="5" rsense="0.015" base_name="p5.0v_alw" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p5.0v_alw" nom="5" map="on" rsense="0.015" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p5.0v_alw_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_mv</name>
 <doc>Bus Voltage of 'p3.3v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.018" tags="bus_voltage_rail" base_name="p3.3v_alw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p3.3v_alw" rsense="0.018" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_mw</name>
 <doc>Power of 'p3.3v_alw' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.018" tags="power_rail" base_name="p3.3v_alw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p3.3v_alw" rsense="0.018" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_ma</name>
 <doc>Current of 'p3.3v_alw' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.018" tags="current_rail" base_name="p3.3v_alw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p3.3v_alw" rsense="0.018" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_shuntmv</name>
 <doc>Shunt Voltage of 'p3.3v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.018" tags="shunt_voltage_rail" base_name="p3.3v_alw" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p3.3v_alw" rsense="0.018" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_ez_config</name>
 <doc>Good default config for 'p3.3v_alw' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.018" base_name="p3.3v_alw" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p3.3v_alw" nom="3.3" map="on" rsense="0.018" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_alw_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_mv</name>
 <doc>Bus Voltage of 'p1.0v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.018" tags="bus_voltage_rail" base_name="p1.0v_alw" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p1.0v_alw" rsense="0.018" nom="1">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_mw</name>
 <doc>Power of 'p1.0v_alw' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.018" tags="power_rail" base_name="p1.0v_alw" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p1.0v_alw" rsense="0.018" nom="1">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_ma</name>
 <doc>Current of 'p1.0v_alw' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.018" tags="current_rail" base_name="p1.0v_alw" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p1.0v_alw" rsense="0.018" nom="1">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_shuntmv</name>
 <doc>Shunt Voltage of 'p1.0v_alw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.018" tags="shunt_voltage_rail" base_name="p1.0v_alw" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p1.0v_alw" rsense="0.018" nom="1">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_ez_config</name>
 <doc>Good default config for 'p1.0v_alw' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1" rsense="0.018" base_name="p1.0v_alw" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p1.0v_alw" nom="1" map="on" rsense="0.018" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p1.0v_alw_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vccio_mv</name>
 <doc>Bus Voltage of 'vccio' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.018" tags="bus_voltage_rail" base_name="vccio" nom="0.975">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vccio" rsense="0.018" nom="0.975">
 </params>
 </control>
 <control>
 <name>vccio_mw</name>
 <doc>Power of 'vccio' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.018" tags="power_rail" base_name="vccio" nom="0.975">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="vccio" rsense="0.018" nom="0.975">
 </params>
 </control>
 <control>
 <name>vccio_ma</name>
 <doc>Current of 'vccio' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.018" tags="current_rail" base_name="vccio" nom="0.975">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="vccio" rsense="0.018" nom="0.975">
 </params>
 </control>
 <control>
 <name>vccio_shuntmv</name>
 <doc>Shunt Voltage of 'vccio' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.018" tags="shunt_voltage_rail" base_name="vccio" nom="0.975">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vccio" rsense="0.018" nom="0.975">
 </params>
 </control>
 <control>
 <name>vccio_ez_config</name>
 <doc>Good default config for 'vccio' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="0.975" rsense="0.018" base_name="vccio" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="vccio" nom="0.975" map="on" rsense="0.018" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>vccio_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vccio_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vccio_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vccio_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vccio_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>vccio_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>pch_prim_core_mv</name>
 <doc>Bus Voltage of 'pch_prim_core' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.015" tags="bus_voltage_rail" base_name="pch_prim_core" nom="0.85">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pch_prim_core" rsense="0.015" nom="0.85">
 </params>
 </control>
 <control>
 <name>pch_prim_core_mw</name>
 <doc>Power of 'pch_prim_core' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.015" tags="power_rail" base_name="pch_prim_core" nom="0.85">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pch_prim_core" rsense="0.015" nom="0.85">
 </params>
 </control>
 <control>
 <name>pch_prim_core_ma</name>
 <doc>Current of 'pch_prim_core' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.015" tags="current_rail" base_name="pch_prim_core" nom="0.85">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pch_prim_core" rsense="0.015" nom="0.85">
 </params>
 </control>
 <control>
 <name>pch_prim_core_shuntmv</name>
 <doc>Shunt Voltage of 'pch_prim_core' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.015" tags="shunt_voltage_rail" base_name="pch_prim_core" nom="0.85">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pch_prim_core" rsense="0.015" nom="0.85">
 </params>
 </control>
 <control>
 <name>pch_prim_core_ez_config</name>
 <doc>Good default config for 'pch_prim_core' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="0.85" rsense="0.015" base_name="pch_prim_core" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pch_prim_core" nom="0.85" map="on" rsense="0.015" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>pch_prim_core_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>pch_prim_core_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>pch_prim_core_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>pch_prim_core_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>pch_prim_core_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>pch_prim_core_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="75" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_mv</name>
 <doc>Bus Voltage of 'p3.3v_dsw_usbc' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.1" tags="bus_voltage_rail" base_name="p3.3v_dsw_usbc" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p3.3v_dsw_usbc" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_mw</name>
 <doc>Power of 'p3.3v_dsw_usbc' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.1" tags="power_rail" base_name="p3.3v_dsw_usbc" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p3.3v_dsw_usbc" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_ma</name>
 <doc>Current of 'p3.3v_dsw_usbc' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.1" tags="current_rail" base_name="p3.3v_dsw_usbc" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p3.3v_dsw_usbc" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_shuntmv</name>
 <doc>Shunt Voltage of 'p3.3v_dsw_usbc' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.1" tags="shunt_voltage_rail" base_name="p3.3v_dsw_usbc" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p3.3v_dsw_usbc" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_ez_config</name>
 <doc>Good default config for 'p3.3v_dsw_usbc' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.1" base_name="p3.3v_dsw_usbc" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p3.3v_dsw_usbc" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dsw_usbc_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="76" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_mv</name>
 <doc>Bus Voltage of 'p3.3v_dx_edp' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.1" tags="bus_voltage_rail" base_name="p3.3v_dx_edp" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="p3.3v_dx_edp" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_mw</name>
 <doc>Power of 'p3.3v_dx_edp' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.1" tags="power_rail" base_name="p3.3v_dx_edp" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="p3.3v_dx_edp" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_ma</name>
 <doc>Current of 'p3.3v_dx_edp' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.1" tags="current_rail" base_name="p3.3v_dx_edp" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="p3.3v_dx_edp" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_shuntmv</name>
 <doc>Shunt Voltage of 'p3.3v_dx_edp' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.1" tags="shunt_voltage_rail" base_name="p3.3v_dx_edp" nom="3.3">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="p3.3v_dx_edp" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_ez_config</name>
 <doc>Good default config for 'p3.3v_dx_edp' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.1" base_name="p3.3v_dx_edp" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="p3.3v_dx_edp" nom="3.3" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>p3.3v_dx_edp_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="77" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_sa_mv</name>
 <doc>Bus Voltage of 'cpu_sa' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.002" tags="bus_voltage_rail" base_name="cpu_sa" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="cpu_sa" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_sa_mw</name>
 <doc>Power of 'cpu_sa' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.002" tags="power_rail" base_name="cpu_sa" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="cpu_sa" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_sa_ma</name>
 <doc>Current of 'cpu_sa' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.002" tags="current_rail" base_name="cpu_sa" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="cpu_sa" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_sa_shuntmv</name>
 <doc>Shunt Voltage of 'cpu_sa' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.002" tags="shunt_voltage_rail" base_name="cpu_sa" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="cpu_sa" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_sa_ez_config</name>
 <doc>Good default config for 'cpu_sa' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1" rsense="0.002" base_name="cpu_sa" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="cpu_sa" nom="1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>cpu_sa_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_sa_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_sa_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_sa_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_sa_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_sa_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="78" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_la_mv</name>
 <doc>Bus Voltage of 'cpu_la' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.002" tags="bus_voltage_rail" base_name="cpu_la" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="cpu_la" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_la_mw</name>
 <doc>Power of 'cpu_la' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.002" tags="power_rail" base_name="cpu_la" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="cpu_la" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_la_ma</name>
 <doc>Current of 'cpu_la' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.002" tags="current_rail" base_name="cpu_la" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="cpu_la" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_la_shuntmv</name>
 <doc>Shunt Voltage of 'cpu_la' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.002" tags="shunt_voltage_rail" base_name="cpu_la" nom="1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="cpu_la" rsense="0.002" nom="1">
 </params>
 </control>
 <control>
 <name>cpu_la_ez_config</name>
 <doc>Good default config for 'cpu_la' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="1" rsense="0.002" base_name="cpu_la" tags="adc_ez_config_ctrls">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="cpu_la" nom="1" map="on" rsense="0.002" tags="adc_ez_config_ctrls">
 </params>
 </control>
 <control>
 <name>cpu_la_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_la_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="1" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_la_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="2" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_la_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="3" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_la_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="4" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 <control>
 <name>cpu_la_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="79" c2d2_interface="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="5" reg_len="2" c2d2_interface="4">
 </params>
 </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cerise_rev0.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cerise_rev0.xml
index 153d721..84af064 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cerise_rev0.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cerise_rev0.xml
@@ -1,853 +1,853 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Tue Sep 13 07:11:52 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:31 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_sys" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.02" nom="7.7">
     </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="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="ppvar_sys" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.02" nom="7.7">
     </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="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="ppvar_sys" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.02" nom="7.7">
     </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="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.02" nom="7.7">
     </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="0" subtype="ez_config" map="on" nom="7.7" rsense="0.02" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_sys" nom="7.7" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>vbat_mv</name>
     <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="vbat" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="vbat" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="vbat" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="vbat" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="ez_config" map="on" nom="7.7" rsense="0.02" base_name="vbat" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="vbat" nom="7.7" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>vbat_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>vbat_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>vbat_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>vbat_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_h1_mv</name>
     <doc>Bus Voltage of 'pp1800_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" rsense="0.05" tags="bus_voltage_rail" base_name="pp1800_h1" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_h1" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_mw</name>
     <doc>Power of 'pp1800_h1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" rsense="0.05" tags="power_rail" base_name="pp1800_h1" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_h1" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_ma</name>
     <doc>Current of 'pp1800_h1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" rsense="0.05" tags="current_rail" base_name="pp1800_h1" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_h1" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" rsense="0.05" tags="shunt_voltage_rail" base_name="pp1800_h1" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_h1" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_ez_config</name>
     <doc>Good default config for 'pp1800_h1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" nom="1.8" rsense="0.05" base_name="pp1800_h1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_h1" nom="1.8" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1800_h1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_h1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_h1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_h1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.1" tags="bus_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.1" 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="ina3221" channel="0" subtype="milliwatts" rsense="0.1" tags="power_rail" base_name="ppvar_bl" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.1" 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="ina3221" channel="0" subtype="milliamps" rsense="0.1" tags="current_rail" base_name="ppvar_bl" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.1" 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="ina3221" channel="0" subtype="shuntmv" rsense="0.1" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.1" 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="ina3221" channel="0" subtype="ez_config" map="on" nom="7.7" rsense="0.1" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="7.7" map="on" rsense="0.1" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_mv</name>
     <doc>Bus Voltage of 'pp1800_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" rsense="0.05" tags="bus_voltage_rail" base_name="pp1800_ec" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_mw</name>
     <doc>Power of 'pp1800_ec' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" rsense="0.05" tags="power_rail" base_name="pp1800_ec" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_ma</name>
     <doc>Current of 'pp1800_ec' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" rsense="0.05" tags="current_rail" base_name="pp1800_ec" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1800_ec" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" rsense="0.05" tags="shunt_voltage_rail" base_name="pp1800_ec" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_ec" rsense="0.05" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_ez_config</name>
     <doc>Good default config for 'pp1800_ec' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" nom="1.8" rsense="0.05" base_name="pp1800_ec" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1800_ec" nom="1.8" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1800_ec_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_mv</name>
     <doc>Bus Voltage of 'pp3300_ctp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ctp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ctp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_mw</name>
     <doc>Power of 'pp3300_ctp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_ctp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_ctp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_ma</name>
     <doc>Current of 'pp3300_ctp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_ctp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_ctp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ctp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ctp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ctp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_ez_config</name>
     <doc>Good default config for 'pp3300_ctp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_ctp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp3300_ctp" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ctp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mv</name>
     <doc>Bus Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" rsense="0.05" tags="bus_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1" rsense="0.05" 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="ina3221" channel="0" subtype="milliwatts" rsense="0.05" tags="power_rail" base_name="pp3300_h1" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1" rsense="0.05" 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="ina3221" channel="0" subtype="milliamps" rsense="0.05" tags="current_rail" base_name="pp3300_h1" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1" rsense="0.05" 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="ina3221" channel="0" subtype="shuntmv" rsense="0.05" tags="shunt_voltage_rail" base_name="pp3300_h1" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1" rsense="0.05" 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="ina3221" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.05" base_name="pp3300_h1" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_h1" nom="3.3" map="on" rsense="0.05" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_h1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_h1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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="1" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_wlan" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_mv</name>
     <doc>Bus Voltage of 'pp1800_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_wlan" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_wlan" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_mw</name>
     <doc>Power of 'pp1800_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp1800_wlan" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_wlan" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_ma</name>
     <doc>Current of 'pp1800_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp1800_wlan" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_wlan" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_wlan" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_wlan" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_ez_config</name>
     <doc>Good default config for 'pp1800_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" nom="1.8" rsense="0.02" base_name="pp1800_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1800_wlan" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_mv</name>
     <doc>Bus Voltage of 'pp3300_lcm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_lcm" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_lcm" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_lcm" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_lcm" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_lcm" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_lcm" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_dram_mv</name>
     <doc>Bus Voltage of 'pp5000_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp5000_dram" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_dram" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_dram_mw</name>
     <doc>Power of 'pp5000_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp5000_dram" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp5000_dram" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_dram_ma</name>
     <doc>Current of 'pp5000_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp5000_dram" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp5000_dram" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp5000_dram" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_dram" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_dram_ez_config</name>
     <doc>Good default config for 'pp5000_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" nom="5.0" rsense="0.02" base_name="pp5000_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp5000_dram" nom="5.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp5000_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_mv</name>
     <doc>Bus Voltage of 'pp5000_pmic' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp5000_pmic" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_pmic" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_mw</name>
     <doc>Power of 'pp5000_pmic' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp5000_pmic" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp5000_pmic" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_ma</name>
     <doc>Current of 'pp5000_pmic' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp5000_pmic" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp5000_pmic" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_pmic' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp5000_pmic" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_pmic" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_ez_config</name>
     <doc>Good default config for 'pp5000_pmic' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" nom="5.0" rsense="0.02" base_name="pp5000_pmic" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp5000_pmic" nom="5.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_pmic_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina219" 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="ina219" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina219" 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="ina219" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina219" 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="ina219" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina219" 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="ina219" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp3300_a" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_mv</name>
     <doc>Bus Voltage of 'ppvar_usb_c0_vbus' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_usb_c0_vbus" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_usb_c0_vbus" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_mw</name>
     <doc>Power of 'ppvar_usb_c0_vbus' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="ppvar_usb_c0_vbus" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_usb_c0_vbus" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_ma</name>
     <doc>Current of 'ppvar_usb_c0_vbus' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="ppvar_usb_c0_vbus" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_usb_c0_vbus" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_usb_c0_vbus' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_usb_c0_vbus" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_usb_c0_vbus" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_ez_config</name>
     <doc>Good default config for 'ppvar_usb_c0_vbus' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" nom="20.0" rsense="0.02" base_name="ppvar_usb_c0_vbus" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="ppvar_usb_c0_vbus" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_usb_c0_vbus_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" 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="ina219" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" 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="ina219" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" 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="ina219" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" 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="ina219" channel="0" subtype="ez_config" map="on" nom="1.8" rsense="0.02" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" base_name="pp1800_a" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina219_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina219_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/chell_r1_inas.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/chell_r1_inas.xml
index 126358e..8a4c3aa 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/chell_r1_inas.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/chell_r1_inas.xml
@@ -1,601 +1,601 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Tue Sep 13 07:11:41 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:24 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp3300_dx_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="ez_config" map="on" nom="3.3" rsense="0.01" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp3300_dx_wlan" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </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="ina3221" channel="2" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" 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="ina3221" channel="2" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" 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="ina3221" channel="2" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" 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="ina3221" channel="2" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" 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="ina3221" channel="2" subtype="ez_config" map="on" nom="3.3" rsense="0.01" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp3300_dx_edp" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp3300_dsw" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp3300_dsw" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_dsw" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" 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="ina3221" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.01" base_name="pp3300_dsw" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp3300_dsw" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp5000_a" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp5000_a" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_a" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="1" subtype="ez_config" map="on" nom="5.0" rsense="0.01" base_name="pp5000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp5000_a" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" 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="2" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" 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="2" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" 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="2" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_a" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" 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="2" subtype="ez_config" map="on" nom="3.3" rsense="0.01" base_name="pp3300_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp3300_a" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="15" reg_len="2" c2d2_interface="4">
     </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="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.01" 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="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.01" 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="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.01" 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="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1800_a" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.01" 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="0" subtype="ez_config" map="on" nom="1.8" rsense="0.01" base_name="pp1800_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp1800_a" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mv</name>
     <doc>Bus Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp1800_dram" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp1800_dram" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1800_dram" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" 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="ina3221" channel="1" subtype="ez_config" map="on" nom="1.8" rsense="0.01" base_name="pp1800_dram" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp1800_dram" nom="1.8" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </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="2" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.01" 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="2" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp1200_vddq" nom="1.2">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.01" 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="2" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp1200_vddq" nom="1.2">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.01" 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="2" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1200_vddq" nom="1.2">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.01" 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="2" subtype="ez_config" map="on" nom="1.2" rsense="0.01" base_name="pp1200_vddq" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp1200_vddq" nom="1.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="15" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1000_a_mv</name>
     <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp1000_a" nom="1.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.01" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_a_mw</name>
     <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp1000_a" nom="1.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.01" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_a_ma</name>
     <doc>Current of 'pp1000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp1000_a" nom="1.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.01" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp1000_a" nom="1.0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.01" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_a_ez_config</name>
     <doc>Good default config for 'pp1000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" nom="1.0" rsense="0.01" base_name="pp1000_a" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" base_name="pp1000_a" nom="1.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp975_io_mv</name>
     <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp975_io" nom="0.975">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.01" nom="0.975">
     </params>
   </control>
   <control>
     <name>pp975_io_mw</name>
     <doc>Power of 'pp975_io' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp975_io" nom="0.975">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.01" nom="0.975">
     </params>
   </control>
   <control>
     <name>pp975_io_ma</name>
     <doc>Current of 'pp975_io' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp975_io" nom="0.975">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.01" nom="0.975">
     </params>
   </control>
   <control>
     <name>pp975_io_shuntmv</name>
     <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp975_io" nom="0.975">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.01" nom="0.975">
     </params>
   </control>
   <control>
     <name>pp975_io_ez_config</name>
     <doc>Good default config for 'pp975_io' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" nom="0.975" rsense="0.01" base_name="pp975_io" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" base_name="pp975_io" nom="0.975" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp975_io_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp975_io_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp975_io_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp975_io_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </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="ina3221" channel="2" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp850_prim_core" nom="0.85">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.01" nom="0.85">
     </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="ina3221" channel="2" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp850_prim_core" nom="0.85">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.01" nom="0.85">
     </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="ina3221" channel="2" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp850_prim_core" nom="0.85">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.01" nom="0.85">
     </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="ina3221" channel="2" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp850_prim_core" nom="0.85">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.01" nom="0.85">
     </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="ina3221" channel="2" subtype="ez_config" map="on" nom="0.85" rsense="0.01" base_name="pp850_prim_core" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" base_name="pp850_prim_core" nom="0.85" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina3221_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina3221_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="15" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="15" reg_len="2" c2d2_interface="4">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev0.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev0.xml
index 5f9ce45..be2c18c 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev0.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev0.xml
@@ -1,1255 +1,1255 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Tue Sep 13 07:11:48 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:29 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="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="ez_config" map="on" nom="20.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mv</name>
     <doc>Bus Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_batt" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="13.05">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mw</name>
     <doc>Power of 'ppvar_batt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="ppvar_batt" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_batt" rsense="0.01" nom="13.05">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ma</name>
     <doc>Current of 'ppvar_batt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="ppvar_batt" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_batt" rsense="0.01" nom="13.05">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_batt" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="13.05">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ez_config</name>
     <doc>Good default config for 'ppvar_batt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="13.05" rsense="0.01" base_name="ppvar_batt" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_batt" nom="13.05" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_batt_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_batt_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_batt_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_batt_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="65" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="65" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_mv</name>
     <doc>Bus Voltage of 'pp4200_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp4200_z2" nom="4.2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_z2" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_z2_mw</name>
     <doc>Power of 'pp4200_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp4200_z2" nom="4.2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp4200_z2" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_z2_ma</name>
     <doc>Current of 'pp4200_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp4200_z2" nom="4.2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp4200_z2" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp4200_z2" nom="4.2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_z2" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_z2_ez_config</name>
     <doc>Good default config for 'pp4200_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="4.2" rsense="0.01" base_name="pp4200_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp4200_z2" nom="4.2" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp4200_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp4200_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="66" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="66" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_bl" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="13.05">
     </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" rsense="0.01" tags="power_rail" base_name="ppvar_bl" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.01" nom="13.05">
     </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" rsense="0.01" tags="current_rail" base_name="ppvar_bl" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.01" nom="13.05">
     </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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_bl" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="13.05">
     </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" nom="13.05" rsense="0.01" base_name="ppvar_bl" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_bl" nom="13.05" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="67" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="67" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp3300_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" 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="ina231" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp3300_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" 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="ina231" channel="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp3300_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp3300_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_z2" rsense="0.01" 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="ina231" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.01" base_name="pp3300_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_z2" nom="3.3" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="68" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="68" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_s5_mv</name>
     <doc>Bus Voltage of 'pp5000_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="pp5000_s5" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_s5" rsense="0.01" 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="ina231" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="pp5000_s5" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_s5" rsense="0.01" 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="ina231" channel="0" subtype="milliamps" rsense="0.01" tags="current_rail" base_name="pp5000_s5" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_s5" rsense="0.01" 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="ina231" channel="0" subtype="shuntmv" rsense="0.01" tags="shunt_voltage_rail" base_name="pp5000_s5" nom="5.0">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_s5" rsense="0.01" 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="ina231" channel="0" subtype="ez_config" map="on" nom="5.0" rsense="0.01" base_name="pp5000_s5" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp5000_s5" nom="5.0" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp5000_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="69" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="69" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" rsense="0.02" 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" rsense="0.02" tags="power_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_gsc_z2" rsense="0.02" 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" rsense="0.02" tags="current_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_gsc_z2" rsense="0.02" 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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_gsc_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_gsc_z2" rsense="0.02" 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" nom="3.3" rsense="0.02" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_gsc_z2" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="70" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="70" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_sys" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="13.05">
     </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" rsense="0.01" tags="power_rail" base_name="ppvar_sys" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.01" nom="13.05">
     </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" rsense="0.01" tags="current_rail" base_name="ppvar_sys" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.01" nom="13.05">
     </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" rsense="0.01" tags="shunt_voltage_rail" base_name="ppvar_sys" nom="13.05">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="13.05">
     </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" nom="13.05" rsense="0.01" base_name="ppvar_sys" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_sys" nom="13.05" map="on" rsense="0.01" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_sys_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_sys_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="71" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="71" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_mv</name>
     <doc>Bus Voltage of 'pp1800_vio18_s3' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_vio18_s3" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_vio18_s3" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_mw</name>
     <doc>Power of 'pp1800_vio18_s3' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp1800_vio18_s3" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_vio18_s3" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_ma</name>
     <doc>Current of 'pp1800_vio18_s3' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp1800_vio18_s3" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_vio18_s3" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_vio18_s3' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_vio18_s3" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_vio18_s3" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_ez_config</name>
     <doc>Good default config for 'pp1800_vio18_s3' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="1.8" rsense="0.02" base_name="pp1800_vio18_s3" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_vio18_s3" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_s3_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="72" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="72" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_mv</name>
     <doc>Bus Voltage of 'pp3300_ts_s3' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ts_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ts_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_mw</name>
     <doc>Power of 'pp3300_ts_s3' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_ts_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ts_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_ma</name>
     <doc>Current of 'pp3300_ts_s3' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_ts_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ts_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ts_s3' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ts_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ts_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_ez_config</name>
     <doc>Good default config for 'pp3300_ts_s3' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_ts_s3" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ts_s3" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ts_s3_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="73" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="73" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_mv</name>
     <doc>Bus Voltage of 'pp1800_gsc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_gsc_z2" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_gsc_z2" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_mw</name>
     <doc>Power of 'pp1800_gsc_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp1800_gsc_z2" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_gsc_z2" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_ma</name>
     <doc>Current of 'pp1800_gsc_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp1800_gsc_z2" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_gsc_z2" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_gsc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_gsc_z2" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_gsc_z2" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_ez_config</name>
     <doc>Good default config for 'pp1800_gsc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="1.8" rsense="0.02" base_name="pp1800_gsc_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_gsc_z2" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_gsc_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="74" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="74" offset="7" reg_len="2" c2d2_interface="4">
     </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="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" 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="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" 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="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" 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="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp1800_ec_vcc" nom="1.8">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" 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="ina231" channel="0" subtype="ez_config" map="on" nom="1.8" rsense="0.02" base_name="pp1800_ec_vcc" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp1800_ec_vcc" nom="1.8" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="75" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="75" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.02" 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" rsense="0.02" tags="power_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.02" 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" rsense="0.02" tags="current_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.02" 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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" rsense="0.02" 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" nom="3.3" rsense="0.02" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_wlan_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="76" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="76" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_mv</name>
     <doc>Bus Voltage of 'pp3300_s3' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s3_mw</name>
     <doc>Power of 'pp3300_s3' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s3_ma</name>
     <doc>Current of 'pp3300_s3' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s3_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_s3' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_s3" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_s3" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s3_ez_config</name>
     <doc>Good default config for 'pp3300_s3' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_s3" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_s3" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_s3_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_s3_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="77" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="77" offset="7" reg_len="2" c2d2_interface="4">
     </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" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z2" rsense="0.02" 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" rsense="0.02" tags="power_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z2" rsense="0.02" 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" rsense="0.02" tags="current_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z2" rsense="0.02" 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" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_ec_z2" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_z2" rsense="0.02" 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" nom="3.3" rsense="0.02" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_ec_z2" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="78" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="78" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_mv</name>
     <doc>Bus Voltage of 'pp3300_lcm_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="pp3300_lcm_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_lcm_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_mw</name>
     <doc>Power of 'pp3300_lcm_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="pp3300_lcm_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_lcm_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_ma</name>
     <doc>Current of 'pp3300_lcm_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="pp3300_lcm_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_lcm_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_lcm_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="pp3300_lcm_x" nom="3.3">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_lcm_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_ez_config</name>
     <doc>Good default config for 'pp3300_lcm_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" nom="3.3" rsense="0.02" base_name="pp3300_lcm_x" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="pp3300_lcm_x" nom="3.3" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="1" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="1" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="2" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="2" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="3" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="3" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="4" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="5" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="6" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="79" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="79" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev1.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev1.xml
index 039bdb7..e36e2d8 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev1.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/cherry_rev1.xml
@@ -1,1255 +1,1255 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Tue Sep 13 07:11:52 2022 -->
+<!-- Autogenerated on Tue Sep 13 12:48:32 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="ina231" channel="0" subtype="millivolts" rsense="0.02" tags="bus_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="milliwatts" rsense="0.02" tags="power_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="milliamps" rsense="0.02" tags="current_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="shuntmv" rsense="0.02" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" nom="20.0">
+    <params cmd="get" interface="servo" drv="ina231" 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="ina231" channel="0" subtype="ez_config" map="on" nom="20.0" rsense="0.02" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" base_name="ppvar_vbus_in" nom="20.0" map="on" rsense="0.02" tags="adc_ez_config_ctrls">
     </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" fmt="hex" map="ina231_cfg" offset="0" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="0" map="ina231_cfg" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="1" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="1" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="2" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="2" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="3" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="3" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="4" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="4" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="5" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="5" reg_len="2" c2d2_interface="4">
     </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" fmt="hex" offset="6" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="6" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" fmt="hex" offset="7" reg_len="2" addr="64" c2d2_interface="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" addr="64" offset="7" reg_len="2" c2d2_interface="4">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mv</name>
     <doc>Bus Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" rsense="0.01" tags="bus_voltage_rail" base_name="ppvar_batt" nom="7.7">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mw</name>
     <doc>Power of 'ppvar_batt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" rsense="0.01" tags="power_rail" base_name="ppvar_batt" nom="7.7">
+    <p