Skip to content

Commit

Permalink
v14.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathieucarbou
mathieucarbou committed Jan 28, 2025
1 parent c84c905 commit 304ac44
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 37 deletions.
8 changes: 4 additions & 4 deletions docs/api/_mycila_j_s_y_8h_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
<div class="line"><a id="l00013" name="l00013"></a><span class="lineno"> 13</span><span class="preprocessor"> #include &lt;ArduinoJson.h&gt;</span></div>
<div class="line"><a id="l00014" name="l00014"></a><span class="lineno"> 14</span><span class="preprocessor">#endif</span></div>
<div class="line"><a id="l00015" name="l00015"></a><span class="lineno"> 15</span> </div>
<div class="line"><a id="l00016" name="l00016"></a><span class="lineno"> 16</span><span class="preprocessor">#define MYCILA_JSY_VERSION &quot;14.0.0&quot;</span></div>
<div class="line"><a id="l00017" name="l00017"></a><span class="lineno"> 17</span><span class="preprocessor">#define MYCILA_JSY_VERSION_MAJOR 13</span></div>
<div class="line"><a id="l00018" name="l00018"></a><span class="lineno"> 18</span><span class="preprocessor">#define MYCILA_JSY_VERSION_MINOR 1</span></div>
<div class="line"><a id="l00019" name="l00019"></a><span class="lineno"> 19</span><span class="preprocessor">#define MYCILA_JSY_VERSION_REVISION 1</span></div>
<div class="line"><a id="l00016" name="l00016"></a><span class="lineno"> 16</span><span class="preprocessor">#define MYCILA_JSY_VERSION &quot;14.0.1&quot;</span></div>
<div class="line"><a id="l00017" name="l00017"></a><span class="lineno"> 17</span><span class="preprocessor">#define MYCILA_JSY_VERSION_MAJOR 14</span></div>
<div class="line"><a id="l00018" name="l00018"></a><span class="lineno"> 18</span><span class="preprocessor">#define MYCILA_JSY_VERSION_MINOR 0</span></div>
<div class="line"><a id="l00019" name="l00019"></a><span class="lineno"> 19</span><span class="preprocessor">#define MYCILA_JSY_VERSION_REVISION 0</span></div>
<div class="line"><a id="l00020" name="l00020"></a><span class="lineno"> 20</span> </div>
<div class="line"><a id="l00021" name="l00021"></a><span class="lineno"> 21</span><span class="comment">// #define MYCILA_JSY_DEBUG 1</span></div>
<div class="line"><a id="l00022" name="l00022"></a><span class="lineno"> 22</span> </div>
Expand Down
66 changes: 36 additions & 30 deletions docs/api/_mycila_j_s_y_metrics_8cpp_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,36 +215,42 @@
<div class="line"><a id="l00119" name="l00119"></a><span class="lineno"> 119</span> <span class="keywordflow">if</span> (!std::isnan(powerFactor))</div>
<div class="line"><a id="l00120" name="l00120"></a><span class="lineno"> 120</span> root[<span class="stringliteral">&quot;power_factor&quot;</span>] = powerFactor;</div>
<div class="line"><a id="l00121" name="l00121"></a><span class="lineno"> 121</span> root[<span class="stringliteral">&quot;active_energy&quot;</span>] = activeEnergy;</div>
<div class="line"><a id="l00122" name="l00122"></a><span class="lineno"> 122</span> root[<span class="stringliteral">&quot;apparent_energy&quot;</span>] = apparentEnergy;</div>
<div class="line"><a id="l00123" name="l00123"></a><span class="lineno"> 123</span> root[<span class="stringliteral">&quot;active_energy_imported&quot;</span>] = activeEnergyImported;</div>
<div class="line"><a id="l00124" name="l00124"></a><span class="lineno"> 124</span> root[<span class="stringliteral">&quot;active_energy_returned&quot;</span>] = activeEnergyReturned;</div>
<div class="line"><a id="l00125" name="l00125"></a><span class="lineno"> 125</span> root[<span class="stringliteral">&quot;reactive_energy&quot;</span>] = reactiveEnergy;</div>
<div class="line"><a id="l00126" name="l00126"></a><span class="lineno"> 126</span> root[<span class="stringliteral">&quot;reactive_energy_imported&quot;</span>] = reactiveEnergyImported;</div>
<div class="line"><a id="l00127" name="l00127"></a><span class="lineno"> 127</span> root[<span class="stringliteral">&quot;reactive_energy_returned&quot;</span>] = reactiveEnergyReturned;</div>
<div class="line"><a id="l00128" name="l00128"></a><span class="lineno"> 128</span> <span class="keywordflow">if</span> (!std::isnan(phaseAngleU))</div>
<div class="line"><a id="l00129" name="l00129"></a><span class="lineno"> 129</span> root[<span class="stringliteral">&quot;phase_angle_u&quot;</span>] = phaseAngleU;</div>
<div class="line"><a id="l00130" name="l00130"></a><span class="lineno"> 130</span> <span class="keywordflow">if</span> (!std::isnan(phaseAngleI))</div>
<div class="line"><a id="l00131" name="l00131"></a><span class="lineno"> 131</span> root[<span class="stringliteral">&quot;phase_angle_i&quot;</span>] = phaseAngleI;</div>
<div class="line"><a id="l00132" name="l00132"></a><span class="lineno"> 132</span> <span class="keywordflow">if</span> (!std::isnan(phaseAngleUI))</div>
<div class="line"><a id="l00133" name="l00133"></a><span class="lineno"> 133</span> root[<span class="stringliteral">&quot;phase_angle_ui&quot;</span>] = phaseAngleUI;</div>
<div class="line"><a id="l00134" name="l00134"></a><span class="lineno"> 134</span> <span class="keywordflow">if</span> (!std::isnan(thdU))</div>
<div class="line"><a id="l00135" name="l00135"></a><span class="lineno"> 135</span> root[<span class="stringliteral">&quot;thd_u&quot;</span>] = thdU;</div>
<div class="line"><a id="l00136" name="l00136"></a><span class="lineno"> 136</span> <span class="keywordflow">if</span> (!std::isnan(thdI))</div>
<div class="line"><a id="l00137" name="l00137"></a><span class="lineno"> 137</span> root[<span class="stringliteral">&quot;thd_i&quot;</span>] = thdI;</div>
<div class="line"><a id="l00138" name="l00138"></a><span class="lineno"> 138</span> <span class="keywordtype">float</span> r = resistance();</div>
<div class="line"><a id="l00139" name="l00139"></a><span class="lineno"> 139</span> <span class="keywordtype">float</span> d = dimmedVoltage();</div>
<div class="line"><a id="l00140" name="l00140"></a><span class="lineno"> 140</span> <span class="keywordtype">float</span> n = nominalPower();</div>
<div class="line"><a id="l00141" name="l00141"></a><span class="lineno"> 141</span> <span class="keywordtype">float</span> t = thdi();</div>
<div class="line"><a id="l00142" name="l00142"></a><span class="lineno"> 142</span> <span class="keywordflow">if</span> (!std::isnan(r))</div>
<div class="line"><a id="l00143" name="l00143"></a><span class="lineno"> 143</span> root[<span class="stringliteral">&quot;resistance&quot;</span>] = r;</div>
<div class="line"><a id="l00144" name="l00144"></a><span class="lineno"> 144</span> <span class="keywordflow">if</span> (!std::isnan(d))</div>
<div class="line"><a id="l00145" name="l00145"></a><span class="lineno"> 145</span> root[<span class="stringliteral">&quot;dimmed_voltage&quot;</span>] = d;</div>
<div class="line"><a id="l00146" name="l00146"></a><span class="lineno"> 146</span> <span class="keywordflow">if</span> (!std::isnan(n))</div>
<div class="line"><a id="l00147" name="l00147"></a><span class="lineno"> 147</span> root[<span class="stringliteral">&quot;nominal_power&quot;</span>] = n;</div>
<div class="line"><a id="l00148" name="l00148"></a><span class="lineno"> 148</span> <span class="keywordflow">if</span> (!std::isnan(t))</div>
<div class="line"><a id="l00149" name="l00149"></a><span class="lineno"> 149</span> root[<span class="stringliteral">&quot;thdi_0&quot;</span>] = t;</div>
<div class="line"><a id="l00150" name="l00150"></a><span class="lineno"> 150</span>}</div>
<div class="line"><a id="l00151" name="l00151"></a><span class="lineno"> 151</span><span class="preprocessor">#endif</span></div>
<div class="line"><a id="l00122" name="l00122"></a><span class="lineno"> 122</span> <span class="keywordflow">if</span> (apparentEnergy)</div>
<div class="line"><a id="l00123" name="l00123"></a><span class="lineno"> 123</span> root[<span class="stringliteral">&quot;apparent_energy&quot;</span>] = apparentEnergy;</div>
<div class="line"><a id="l00124" name="l00124"></a><span class="lineno"> 124</span> <span class="keywordflow">if</span> (activeEnergyImported)</div>
<div class="line"><a id="l00125" name="l00125"></a><span class="lineno"> 125</span> root[<span class="stringliteral">&quot;active_energy_imported&quot;</span>] = activeEnergyImported;</div>
<div class="line"><a id="l00126" name="l00126"></a><span class="lineno"> 126</span> <span class="keywordflow">if</span> (activeEnergyReturned)</div>
<div class="line"><a id="l00127" name="l00127"></a><span class="lineno"> 127</span> root[<span class="stringliteral">&quot;active_energy_returned&quot;</span>] = activeEnergyReturned;</div>
<div class="line"><a id="l00128" name="l00128"></a><span class="lineno"> 128</span> <span class="keywordflow">if</span> (reactiveEnergy)</div>
<div class="line"><a id="l00129" name="l00129"></a><span class="lineno"> 129</span> root[<span class="stringliteral">&quot;reactive_energy&quot;</span>] = reactiveEnergy;</div>
<div class="line"><a id="l00130" name="l00130"></a><span class="lineno"> 130</span> <span class="keywordflow">if</span> (reactiveEnergyImported)</div>
<div class="line"><a id="l00131" name="l00131"></a><span class="lineno"> 131</span> root[<span class="stringliteral">&quot;reactive_energy_imported&quot;</span>] = reactiveEnergyImported;</div>
<div class="line"><a id="l00132" name="l00132"></a><span class="lineno"> 132</span> <span class="keywordflow">if</span> (reactiveEnergyReturned)</div>
<div class="line"><a id="l00133" name="l00133"></a><span class="lineno"> 133</span> root[<span class="stringliteral">&quot;reactive_energy_returned&quot;</span>] = reactiveEnergyReturned;</div>
<div class="line"><a id="l00134" name="l00134"></a><span class="lineno"> 134</span> <span class="keywordflow">if</span> (!std::isnan(phaseAngleU))</div>
<div class="line"><a id="l00135" name="l00135"></a><span class="lineno"> 135</span> root[<span class="stringliteral">&quot;phase_angle_u&quot;</span>] = phaseAngleU;</div>
<div class="line"><a id="l00136" name="l00136"></a><span class="lineno"> 136</span> <span class="keywordflow">if</span> (!std::isnan(phaseAngleI))</div>
<div class="line"><a id="l00137" name="l00137"></a><span class="lineno"> 137</span> root[<span class="stringliteral">&quot;phase_angle_i&quot;</span>] = phaseAngleI;</div>
<div class="line"><a id="l00138" name="l00138"></a><span class="lineno"> 138</span> <span class="keywordflow">if</span> (!std::isnan(phaseAngleUI))</div>
<div class="line"><a id="l00139" name="l00139"></a><span class="lineno"> 139</span> root[<span class="stringliteral">&quot;phase_angle_ui&quot;</span>] = phaseAngleUI;</div>
<div class="line"><a id="l00140" name="l00140"></a><span class="lineno"> 140</span> <span class="keywordflow">if</span> (!std::isnan(thdU))</div>
<div class="line"><a id="l00141" name="l00141"></a><span class="lineno"> 141</span> root[<span class="stringliteral">&quot;thd_u&quot;</span>] = thdU;</div>
<div class="line"><a id="l00142" name="l00142"></a><span class="lineno"> 142</span> <span class="keywordflow">if</span> (!std::isnan(thdI))</div>
<div class="line"><a id="l00143" name="l00143"></a><span class="lineno"> 143</span> root[<span class="stringliteral">&quot;thd_i&quot;</span>] = thdI;</div>
<div class="line"><a id="l00144" name="l00144"></a><span class="lineno"> 144</span> <span class="keywordtype">float</span> r = resistance();</div>
<div class="line"><a id="l00145" name="l00145"></a><span class="lineno"> 145</span> <span class="keywordtype">float</span> d = dimmedVoltage();</div>
<div class="line"><a id="l00146" name="l00146"></a><span class="lineno"> 146</span> <span class="keywordtype">float</span> n = nominalPower();</div>
<div class="line"><a id="l00147" name="l00147"></a><span class="lineno"> 147</span> <span class="keywordtype">float</span> t = thdi();</div>
<div class="line"><a id="l00148" name="l00148"></a><span class="lineno"> 148</span> <span class="keywordflow">if</span> (!std::isnan(r))</div>
<div class="line"><a id="l00149" name="l00149"></a><span class="lineno"> 149</span> root[<span class="stringliteral">&quot;resistance&quot;</span>] = r;</div>
<div class="line"><a id="l00150" name="l00150"></a><span class="lineno"> 150</span> <span class="keywordflow">if</span> (!std::isnan(d))</div>
<div class="line"><a id="l00151" name="l00151"></a><span class="lineno"> 151</span> root[<span class="stringliteral">&quot;dimmed_voltage&quot;</span>] = d;</div>
<div class="line"><a id="l00152" name="l00152"></a><span class="lineno"> 152</span> <span class="keywordflow">if</span> (!std::isnan(n))</div>
<div class="line"><a id="l00153" name="l00153"></a><span class="lineno"> 153</span> root[<span class="stringliteral">&quot;nominal_power&quot;</span>] = n;</div>
<div class="line"><a id="l00154" name="l00154"></a><span class="lineno"> 154</span> <span class="keywordflow">if</span> (!std::isnan(t))</div>
<div class="line"><a id="l00155" name="l00155"></a><span class="lineno"> 155</span> root[<span class="stringliteral">&quot;thdi_0&quot;</span>] = t;</div>
<div class="line"><a id="l00156" name="l00156"></a><span class="lineno"> 156</span>}</div>
<div class="line"><a id="l00157" name="l00157"></a><span class="lineno"> 157</span><span class="preprocessor">#endif</span></div>
<div class="ttc" id="aclass_mycila_1_1_j_s_y_1_1_metrics_html"><div class="ttname"><a href="class_mycila_1_1_j_s_y_1_1_metrics.html">Mycila::JSY::Metrics</a></div><div class="ttdef"><b>Definition</b> <a href="_mycila_j_s_y_8h_source.html#l00125">MycilaJSY.h:125</a></div></div>
<div class="ttc" id="aclass_mycila_1_1_j_s_y_1_1_metrics_html_a0144439f2ce32ccec0d614214979fa86"><div class="ttname"><a href="class_mycila_1_1_j_s_y_1_1_metrics.html#a0144439f2ce32ccec0d614214979fa86">Mycila::JSY::Metrics::resistance</a></div><div class="ttdeci">float resistance() const</div><div class="ttdoc">Compute the resistance of the load in ohms (R = P / I^2).</div><div class="ttdef"><b>Definition</b> <a href="#l00016">MycilaJSYMetrics.cpp:16</a></div></div>
<div class="ttc" id="aclass_mycila_1_1_j_s_y_1_1_metrics_html_a12e7169314005ebc298db4fcf99a5711"><div class="ttname"><a href="class_mycila_1_1_j_s_y_1_1_metrics.html#a12e7169314005ebc298db4fcf99a5711">Mycila::JSY::Metrics::apparentPower</a></div><div class="ttdeci">float apparentPower</div><div class="ttdoc">Apparent power in volt-amperes (VA). Always positive.</div><div class="ttdef"><b>Definition</b> <a href="_mycila_j_s_y_8h_source.html#l00162">MycilaJSY.h:162</a></div></div>
Expand Down
2 changes: 1 addition & 1 deletion library.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MycilaJSY",
"version": "14.0.0",
"version": "14.0.1",
"description": "Arduino / ESP32 library for the JSY1031, JSY-MK-163, JSY-MK-193, JSY-MK-194, JSY-MK-227, JSY-MK-229, JSY-MK-333 families single-phase and three-phase AC bidirectional meters from Shenzhen Jiansiyan Technologies Co, Ltd.",
"keywords": "JSY1031, JSY-MK-163, JSY-MK-193, JSY-MK-194, JSY-MK-227, JSY-MK-229, JSY-MK-333",
"homepage": "https://github.com/mathieucarbou/MycilaJSY",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=MycilaJSY
version=14.0.0
version=14.0.1
author=Mathieu Carbou <[email protected]>
maintainer=Mathieu Carbou <[email protected]>
sentence=Arduino / ESP32 library for the JSY1031, JSY-MK-163, JSY-MK-193, JSY-MK-194, JSY-MK-227, JSY-MK-229, JSY-MK-333 families single-phase and three-phase AC bidirectional meters from Shenzhen Jiansiyan Technologies Co, Ltd.
Expand Down
2 changes: 1 addition & 1 deletion src/MycilaJSY.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <ArduinoJson.h>
#endif

#define MYCILA_JSY_VERSION "14.0.0"
#define MYCILA_JSY_VERSION "14.0.1"
#define MYCILA_JSY_VERSION_MAJOR 14
#define MYCILA_JSY_VERSION_MINOR 0
#define MYCILA_JSY_VERSION_REVISION 0
Expand Down

0 comments on commit 304ac44

Please sign in to comment.