diff --git a/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv b/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv index 61f12cb..7d62f55 100755 --- a/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv +++ b/software/dashboard/grafana/co2/dashboard_input_CO2-emissions.csv @@ -1,14 +1,14 @@ Jahr,Verarbeitendes Gewerbe (in kt),Verkehr gesamt (in kt),Straßenverkehr (in kt),Haushalte und GHD gesamt (in kt),Haushalte (in kt),"Gewerbe, Handel, Dienstleistungen GHD (in kt)",CO2-Emissionen gesamt (in kt) -2020,3702,3760,2989,6070,3165,2905,13532 -2019,3956,4708,3313,6477,3451,3026,15140 -2018,4220,4755,3294,6982,3600,3382,15957 -2017,4630,4653,3333,7012,3509,3503,16294 -2016,4661,4577,3287,7314,3637,3677,16552 -2015,5135,4460,3198,7434,3593,3841,17029 -2014,5388,4417,3178,7419,3657,3762,17224 -2013,5224,4337,3165,8277,4056,4221,17839 -2012,5848,4259,3033,8313,4030,4283,18419 -2011,5714,4279,3045,8143,4052,4091,18136 -2010,5899,4243,3065,8611,4245,4366,18753 -2009,5442,4172,3013,8360,4159,4201,17974 -2008,5835,4234,3019,8462,4284,4178,18531 +2020-01-01,3702,3760,2989,6070,3165,2905,13532 +2019-01-01,3956,4708,3313,6477,3451,3026,15140 +2018-01-01,4220,4755,3294,6982,3600,3382,15957 +2017-01-01,4630,4653,3333,7012,3509,3503,16294 +2016-01-01,4661,4577,3287,7314,3637,3677,16552 +2015-01-01,5135,4460,3198,7434,3593,3841,17029 +2014-01-01,5388,4417,3178,7419,3657,3762,17224 +2013-01-01,5224,4337,3165,8277,4056,4221,17839 +2012-01-01,5848,4259,3033,8313,4030,4283,18419 +2011-01-01,5714,4279,3045,8143,4052,4091,18136 +2010-01-01,5899,4243,3065,8611,4245,4366,18753 +2009-01-01,5442,4172,3013,8360,4159,4201,17974 +2008-01-01,5835,4234,3019,8462,4284,4178,18531 diff --git a/software/dashboard/grafana/co2/job_cncCutter.csv b/software/dashboard/grafana/co2/job_cncCutter.csv new file mode 100755 index 0000000..3e92978 --- /dev/null +++ b/software/dashboard/grafana/co2/job_cncCutter.csv @@ -0,0 +1,3 @@ +ID,Path,StartTime,EndTime +0,C:\Users\InMachines\Desktop\MQTT\bCNC-laser\tests\static\sample.gcode,2023-03-01 12:31:30.351399,2023-03-01 12:31:52.538042 +1,C:\Users\InMachines\Desktop\MQTT\bCNC-laser\tests\static\sample.gcode,2023-03-01 12:32:17.547355,2023-03-01 12:32:38.265005 diff --git a/software/dashboard/grafana/co2/state_cnc.csv b/software/dashboard/grafana/co2/state_cnc.csv new file mode 100755 index 0000000..0ab422f --- /dev/null +++ b/software/dashboard/grafana/co2/state_cnc.csv @@ -0,0 +1,13 @@ +Time,State-CNC,State-Lasercutter,State-3D-Printer +2023-03-01 12:31:28,Connected,Connected,Connected +2023-03-01 12:31:29,Idle,Idle,Idle +2023-03-01 12:31:30,Idle, Run,Idle +2023-03-01 12:31:31,Run,Idle,Run +2023-03-01 12:31:32,Idle,Run,Run +2023-03-01 12:31:33,Run,Run,Run +2023-03-01 12:31:52,Idle,Idle,Run +2023-03-01 12:31:52,Idle,Run,Idle +2023-03-01 12:32:17,Idle,Run,Idle +2023-03-01 12:32:20,Run,Idle,Run +2023-03-01 12:32:39,Idle,Run,Run +2023-03-01 12:32:39,Idle,Idle,Idle diff --git a/software/dashboard/grafana/grafana.db b/software/dashboard/grafana/grafana.db index 87fdac6..47bf115 100755 Binary files a/software/dashboard/grafana/grafana.db and b/software/dashboard/grafana/grafana.db differ