Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

mac

2023-08-29 2d5cd35af7437ad4015d38594d8c721dc6166b11

 HDL_ON/Entity/Function/FloorHeating.cs

@@ -71,14 +71,29 @@
        /// </summary>
        public string GetTempUnitString(Function function)
        {
            var tt = function.GetAttrState(FunctionAttributeKey.TempType);
            if (tt == "0")
            var tt = function.GetAttribute(FunctionAttributeKey.TempType);
            if (tt == null)
            {
                return "°C";
            }
            if (tt.unit == string.Empty)
            {
                return "°C";
            }
            else
            {
                return tt;
                if (tt.unit == "C")
                {
                    return "°C";
                }
                else if (tt.unit == "F")
                {
                    return "°F";
                }
                else
                {
                    return tt.unit;
                }
            }
        }