Update dimmer names

mathieucarbou · Jan 7, 2025 · 571a0b4 · 571a0b4
1 parent 9e3941e
commit 571a0b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/data/config.html b/data/config.html
@@ -168,12 +168,12 @@ <h1>YaSolR Configuration</h1>
     grid_freq: ["Nominal Grid Frequency (0 == auto-detect)", "select", "0,50,60"],
     o1_dim_min: ["Output 1 Dimmer Remap Min (%)", "percent"],
     o1_dim_max: ["Output 1 Dimmer Remap Max (%)", "percent"],
-    o1_dim_type: ["Output 1 Dimmer Type", "select", "LSA + DAC GP8211S (DFR1071),LSA + DAC GP8403 (DFR0971),LSA + DAC GP8413 (DFR1073),LSA + PWM->Analog,Robodyn 24A / 40A,SSR Random,SSR Sync (Zero-Cross),Triac / Thyristor"],
+    o1_dim_type: ["Output 1 Dimmer Type", "select", "LSA + DAC GP8211S (DFR1071),LSA + DAC GP8403 (DFR0971),LSA + DAC GP8413 (DFR1073),LSA + PWM->Analog 0-10V only,LSA + PWM->Analog 0-10V + ZCD,Random Solid State Relay + ZCD,Robodyn 24A / 40A,Triac + ZCD,Zero-crossing Solid State Relay"],
     o1_relay_type: ["Output 1 Bypass Relay Type", "select", "NO,NC"],
     o1_resistance: ["Output 1 Resistance (Ohm)", "uint"],
     o2_dim_min: ["Output 2 Dimmer Remap Min (%)", "percent"],
     o2_dim_max: ["Output 2 Dimmer Remap Max (%)", "percent"],
-    o2_dim_type: ["Output 2 Dimmer Type", "select", "LSA + DAC GP8211S (DFR1071),LSA + DAC GP8403 (DFR0971),LSA + DAC GP8413 (DFR1073),LSA + PWM->Analog,Robodyn 24A / 40A,SSR Random,SSR Sync (Zero-Cross),Triac / Thyristor"],
+    o2_dim_type: ["Output 2 Dimmer Type", "select", "LSA + DAC GP8211S (DFR1071),LSA + DAC GP8403 (DFR0971),LSA + DAC GP8413 (DFR1073),LSA + PWM->Analog 0-10V only,LSA + PWM->Analog 0-10V + ZCD,Random Solid State Relay + ZCD,Robodyn 24A / 40A,Triac + ZCD,Zero-crossing Solid State Relay"],
     o2_relay_type: ["Output 2 Bypass Relay Type", "select", "NO,NC"],
     o2_resistance: ["Output 2 Resistance (Ohm)", "uint"],
     relay1_load: ["Relay 1 Automatic Control: Connected Load (Watts)", "uint"],

diff --git a/include/yasolr_macros.h b/include/yasolr_macros.h
@@ -46,12 +46,12 @@
 #define YASOLR_DIMMER_LSA_GP8211S          "LSA + DAC GP8211S (DFR1071)"
 #define YASOLR_DIMMER_LSA_GP8403           "LSA + DAC GP8403  (DFR0971)"
 #define YASOLR_DIMMER_LSA_GP8413           "LSA + DAC GP8413  (DFR1073)"
-#define YASOLR_DIMMER_LSA_PWM              "LSA + PWM->Analog 0-10V"
+#define YASOLR_DIMMER_LSA_PWM              "LSA + PWM->Analog 0-10V only"
 #define YASOLR_DIMMER_LSA_PWM_ZCD          "LSA + PWM->Analog 0-10V + ZCD"
-#define YASOLR_DIMMER_RANDOM_SSR           "Random SSR + ZCD"
-#define YASOLR_DIMMER_ROBODYN              "Robodyn 24/40A (Triac + ZCD)"
+#define YASOLR_DIMMER_RANDOM_SSR           "Random Solid State Relay + ZCD"
+#define YASOLR_DIMMER_ROBODYN              "Robodyn 24A / 40A"
 #define YASOLR_DIMMER_TRIAC                "Triac + ZCD"
-#define YASOLR_DIMMER_ZC_SSR               "Zero-crossing SSR"
+#define YASOLR_DIMMER_ZC_SSR               "Zero-crossing Solid State Relay"
 #define YASOLR_DISPLAY_LINE_SIZE           21
 #define YASOLR_DISPLAY_LINES               5
 #define YASOLR_GRAPH_POINTS                60