diff --git a/.gitignore b/.gitignore index a5292fe..828c902 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ KiCad/CanGrow/CanGrow-backups KiCad/CanGrow/CanGrow.kicad_sch-bak KiCad/CanGrow/fp-info-cache +Arduino/CanGrow/CanGrow.geany +KiCad/CanGrow/gerber/*.zip diff --git a/Arduino/CanGrow/CanGrow_WebFunctions.h b/Arduino/CanGrow/CanGrow_WebFunctions.h index c824f83..816dd09 100644 --- a/Arduino/CanGrow/CanGrow_WebFunctions.h +++ b/Arduino/CanGrow/CanGrow_WebFunctions.h @@ -973,7 +973,7 @@ void APIgetDebug() { // WiFi - JsonObject objWiFi = jsonDebug.add(); + JsonObject objWiFi = jsonDebug["wifi"].add(); objWiFi["ssid"] = WIFIssid; objWiFi["dhcp"] = WIFIuseDHCP; objWiFi["ip"] = WiFi.localIP().toString(); @@ -982,7 +982,7 @@ void APIgetDebug() { objWiFi["dns"] = WiFi.dnsIP().toString(); // System - JsonObject objSystem = jsonDebug.add(); + JsonObject objSystem = jsonDebug["system"].add(); objSystem["UseFan"] = UseFan; objSystem["UsePump"] = UsePump; objSystem["UseLEDrelais"] = UseLEDrelais; @@ -995,21 +995,21 @@ void APIgetDebug() { objSystem["MaintenanceDuration"] = MaintenanceDuration; // Grow - JsonObject objGrow = jsonDebug.add(); - objSystem["GrowName"] = GrowName; - objSystem["GrowStart"] = GrowStart; - objSystem["GrowStartDate"] = returnStrDateFromEpoch(GrowStart); - objSystem["DaysVeg"] = DaysVeg; - objSystem["DaysBloom"] = DaysBloom; - objSystem["LighthoursVeg"] = LighthoursVeg; - objSystem["LighthoursBloom"] = LighthoursBloom; - objSystem["SunriseHour"] = SunriseHour; - objSystem["SunriseMinute"] = SunriseMinute; - objSystem["SunFade"] = SunFade; - objSystem["SunFadeDuration"] = SunFadeDuration; - objSystem["PinLEDPWM"] = PinLEDPWM; - objSystem["PinFANPWM"] = PinFANPWM; - objSystem["DayOfGrow"] = DayOfGrow; + JsonObject objGrow = jsonDebug["grow"].add(); + objGrow["GrowName"] = GrowName; + objGrow["GrowStart"] = GrowStart; + objGrow["GrowStartDate"] = returnStrDateFromEpoch(GrowStart); + objGrow["DaysVeg"] = DaysVeg; + objGrow["DaysBloom"] = DaysBloom; + objGrow["LighthoursVeg"] = LighthoursVeg; + objGrow["LighthoursBloom"] = LighthoursBloom; + objGrow["SunriseHour"] = SunriseHour; + objGrow["SunriseMinute"] = SunriseMinute; + objGrow["SunFade"] = SunFade; + objGrow["SunFadeDuration"] = SunFadeDuration; + objGrow["PinLEDPWM"] = PinLEDPWM; + objGrow["PinFANPWM"] = PinFANPWM; + objGrow["DayOfGrow"] = DayOfGrow;