Update event controller (as query instead) + add stls + update alarm controller

This commit is contained in:
Thomas Fransolet 2022-03-10 15:34:06 +01:00
parent 256231169a
commit 6e0c09a0e6
11 changed files with 125311 additions and 13 deletions

98390
3D Printing/CE3PRO_Body1.gcode Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,578 @@
;FLAVOR:Marlin
;TIME:84
;Filament used: 0.0463704m
;Layer height: 0.2
;MINX:67.945
;MINY:96.5
;MINZ:0.2
;MAXX:152.055
;MAXY:123.5
;MAXZ:0.2
;Generated with Cura_SteamEngine 4.8.0
M140 S60
M105
M190 S60
M104 S200
M105
M109 S200
M82 ;absolute extrusion mode
; Ender 3 Custom Start G-code
G92 E0 ; Reset Extruder
G28 ; Home all axes
G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position
G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line
G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little
G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line
G92 E0 ; Reset Extruder
G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish
G92 E0
G92 E0
G1 F1500 E-6.5
;LAYER_COUNT:10
;LAYER:0
M107
G0 F6000 X72.571 Y98.551 Z0.2
;TYPE:SKIRT
G1 F1500 E0
G1 F1200 X73.357 Y98.039 E0.0312
G1 X74.184 Y97.597 E0.06239
G1 X75.046 Y97.227 E0.09359
G1 X75.936 Y96.931 E0.12478
G1 X76.848 Y96.713 E0.15597
G1 X77.775 Y96.572 E0.18716
G1 X78.646 Y96.513 E0.21619
G1 X78.967 Y96.504 E0.22687
G1 X79.275 Y96.5 E0.23712
G1 X140.348 Y96.5 E2.26842
G1 X141.204 Y96.511 E2.29689
G1 X142.14 Y96.565 E2.32807
G1 X143.068 Y96.697 E2.35925
G1 X143.982 Y96.909 E2.39046
G1 X144.874 Y97.198 E2.42164
G1 X145.739 Y97.561 E2.45284
G1 X146.569 Y97.997 E2.48403
G1 X147.36 Y98.502 E2.51524
G1 X148.104 Y99.073 E2.54643
G1 X148.797 Y99.705 E2.57763
G1 X149.434 Y100.393 E2.60881
G1 X150.009 Y101.134 E2.64001
G1 X150.52 Y101.92 E2.67119
G1 X150.962 Y102.748 E2.70241
G1 X151.331 Y103.61 E2.73359
G1 X151.626 Y104.5 E2.76478
G1 X151.844 Y105.412 E2.79597
G1 X151.984 Y106.34 E2.82718
G1 X152.042 Y107.201 E2.85588
G1 X152.051 Y107.521 E2.86653
G1 X152.055 Y107.83 E2.87681
G1 X152.054 Y111.9 E3.01218
G1 X152.045 Y112.627 E3.03636
G1 X151.994 Y113.564 E3.06757
G1 X151.862 Y114.492 E3.09875
G1 X151.653 Y115.406 E3.12993
G1 X151.366 Y116.299 E3.16113
G1 X151.004 Y117.165 E3.19235
G1 X150.57 Y117.996 E3.22353
G1 X150.066 Y118.787 E3.25472
G1 X149.497 Y119.532 E3.2859
G1 X148.866 Y120.227 E3.31712
G1 X148.179 Y120.865 E3.34831
G1 X147.44 Y121.442 E3.37949
G1 X146.654 Y121.954 E3.41069
G1 X145.828 Y122.397 E3.44187
G1 X144.966 Y122.769 E3.47309
G1 X144.077 Y123.065 E3.50426
G1 X143.165 Y123.285 E3.53546
G1 X142.238 Y123.426 E3.56665
G1 X141.354 Y123.487 E3.59612
G1 X141.033 Y123.496 E3.6068
G1 X140.725 Y123.5 E3.61704
G1 X79.51 Y123.499 E5.65306
G1 X78.812 Y123.49 E5.67628
G1 X77.876 Y123.438 E5.70746
G1 X76.947 Y123.306 E5.73867
G1 X76.033 Y123.096 E5.76986
G1 X75.14 Y122.809 E5.80106
G1 X74.275 Y122.446 E5.83226
G1 X73.444 Y122.012 E5.86344
G1 X72.653 Y121.508 E5.89464
G1 X71.908 Y120.938 E5.92584
G1 X71.214 Y120.307 E5.95703
G1 X70.577 Y119.62 E5.98819
G1 X70 Y118.88 E6.0194
G1 X69.488 Y118.094 E6.0506
G1 X69.045 Y117.267 E6.08181
G1 X68.674 Y116.406 E6.11299
G1 X68.378 Y115.516 E6.14419
G1 X68.159 Y114.604 E6.17538
G1 X68.018 Y113.677 E6.20657
G1 X67.958 Y112.788 E6.2362
G1 X67.949 Y112.455 E6.24728
G1 X67.945 Y112.158 E6.25716
G1 X67.946 Y108.025 E6.39463
G1 X67.955 Y107.36 E6.41675
G1 X68.008 Y106.424 E6.44793
G1 X68.14 Y105.495 E6.47914
G1 X68.351 Y104.581 E6.51034
G1 X68.639 Y103.689 E6.54151
G1 X69.002 Y102.824 E6.57271
G1 X69.437 Y101.993 E6.60391
G1 X69.941 Y101.203 E6.63508
G1 X70.511 Y100.458 E6.66628
G1 X71.143 Y99.764 E6.6975
G1 X71.831 Y99.127 E6.72868
G1 X72.571 Y98.551 E6.75987
G0 F6000 X72.955 Y98.77
G1 F1200 X73.736 Y98.282 E6.7905
G1 X74.556 Y97.864 E6.82111
G1 X75.41 Y97.519 E6.85175
G1 X76.29 Y97.249 E6.88236
G1 X77.19 Y97.057 E6.91297
G1 X78.104 Y96.943 E6.94361
G1 X78.657 Y96.913 E6.96203
G1 X78.978 Y96.904 E6.97271
G1 X79.275 Y96.9 E6.98259
G1 X140.348 Y96.9 E9.01388
G1 X141.198 Y96.911 E9.04216
G1 X142.117 Y96.964 E9.07277
G1 X143.028 Y97.097 E9.10339
G1 X143.924 Y97.308 E9.13401
G1 X144.798 Y97.596 E9.16462
G1 X145.645 Y97.959 E9.19527
G1 X146.456 Y98.394 E9.22588
G1 X147.226 Y98.898 E9.25648
G1 X147.95 Y99.467 E9.28711
G1 X148.622 Y100.097 E9.31775
G1 X149.237 Y100.782 E9.34837
G1 X149.79 Y101.518 E9.37899
G1 X150.277 Y102.299 E9.4096
G1 X150.694 Y103.12 E9.44023
G1 X151.039 Y103.974 E9.47086
G1 X151.308 Y104.854 E9.50147
G1 X151.5 Y105.755 E9.53211
G1 X151.613 Y106.668 E9.5627
G1 X151.642 Y107.212 E9.58082
G1 X151.651 Y107.532 E9.59147
G1 X151.655 Y107.83 E9.60138
G1 X151.654 Y111.895 E9.73659
G1 X151.645 Y112.622 E9.76077
G1 X151.594 Y113.541 E9.79138
G1 X151.463 Y114.453 E9.82203
G1 X151.253 Y115.349 E9.85263
G1 X150.967 Y116.224 E9.88325
G1 X150.606 Y117.071 E9.91387
G1 X150.172 Y117.883 E9.9445
G1 X149.67 Y118.655 E9.97513
G1 X149.102 Y119.38 E10.00576
G1 X148.474 Y120.053 E10.03637
G1 X147.79 Y120.669 E10.06699
G1 X147.055 Y121.223 E10.0976
G1 X146.275 Y121.712 E10.12822
G1 X145.455 Y122.131 E10.15885
G1 X144.602 Y122.477 E10.18947
G1 X143.722 Y122.748 E10.22009
G1 X142.822 Y122.941 E10.25071
G1 X141.908 Y123.056 E10.28135
G1 X141.343 Y123.087 E10.30017
G1 X141.022 Y123.096 E10.31085
G1 X140.725 Y123.1 E10.32073
G1 X79.515 Y123.099 E12.35658
G1 X78.817 Y123.09 E12.3798
G1 X77.898 Y123.038 E12.41041
G1 X76.987 Y122.907 E12.44102
G1 X76.091 Y122.697 E12.47163
G1 X75.216 Y122.41 E12.50226
G1 X74.369 Y122.048 E12.5329
G1 X73.557 Y121.614 E12.56352
G1 X72.786 Y121.112 E12.59412
G1 X72.061 Y120.544 E12.62475
G1 X71.388 Y119.915 E12.65539
G1 X70.773 Y119.231 E12.68598
G1 X70.219 Y118.496 E12.7166
G1 X69.731 Y117.715 E12.74723
G1 X69.312 Y116.895 E12.77785
G1 X68.966 Y116.042 E12.80847
G1 X68.696 Y115.162 E12.83909
G1 X68.503 Y114.261 E12.86973
G1 X68.389 Y113.348 E12.90033
G1 X68.358 Y112.777 E12.91935
G1 X68.349 Y112.444 E12.93043
G1 X68.345 Y112.158 E12.93995
G1 X68.346 Y108.031 E13.07721
G1 X68.355 Y107.366 E13.09933
G1 X68.407 Y106.446 E13.12998
G1 X68.539 Y105.535 E13.1606
G1 X68.75 Y104.639 E13.19121
G1 X69.037 Y103.764 E13.22184
G1 X69.4 Y102.918 E13.25246
G1 X69.834 Y102.106 E13.28308
G1 X70.337 Y101.335 E13.3137
G1 X70.906 Y100.611 E13.34433
G1 X71.534 Y99.939 E13.37492
G1 X72.219 Y99.323 E13.40556
G1 X72.955 Y98.77 E13.43618
G0 F6000 X73.339 Y98.994
G1 F1200 X74.114 Y98.531 E13.46621
G1 X74.927 Y98.138 E13.49624
G1 X75.772 Y97.818 E13.52629
G1 X76.641 Y97.575 E13.5563
G1 X77.529 Y97.409 E13.58635
G1 X78.668 Y97.313 E13.62437
G1 X78.989 Y97.304 E13.63505
G1 X79.275 Y97.3 E13.64456
G1 X140.348 Y97.3 E15.67586
G1 X141.192 Y97.311 E15.70393
G1 X142.094 Y97.364 E15.73398
G1 X142.987 Y97.496 E15.76401
G1 X143.865 Y97.707 E15.79404
G1 X144.721 Y97.995 E15.82408
G1 X145.548 Y98.357 E15.85411
G1 X146.34 Y98.792 E15.88416
G1 X147.091 Y99.294 E15.91421
G1 X147.794 Y99.861 E15.94425
G1 X148.444 Y100.488 E15.97428
G1 X149.036 Y101.17 E16.00432
G1 X149.566 Y101.901 E16.03435
G1 X150.028 Y102.677 E16.06439
G1 X150.421 Y103.49 E16.09442
G1 X150.739 Y104.335 E16.12445
G1 X150.982 Y105.205 E16.1545
G1 X151.147 Y106.093 E16.18454
G1 X151.242 Y107.223 E16.22225
G1 X151.251 Y107.543 E16.2329
G1 X151.255 Y107.83 E16.24245
G1 X151.254 Y111.89 E16.37748
G1 X151.245 Y112.617 E16.40167
G1 X151.194 Y113.519 E16.43171
G1 X151.063 Y114.413 E16.46177
G1 X150.854 Y115.291 E16.49178
G1 X150.568 Y116.148 E16.52183
G1 X150.207 Y116.976 E16.55188
G1 X149.775 Y117.768 E16.58188
G1 X149.274 Y118.52 E16.61194
G1 X148.708 Y119.224 E16.64198
G1 X148.083 Y119.875 E16.672
G1 X147.402 Y120.469 E16.70205
G1 X146.671 Y121 E16.7321
G1 X145.897 Y121.464 E16.76212
G1 X145.084 Y121.858 E16.79217
G1 X144.24 Y122.178 E16.82219
G1 X143.37 Y122.423 E16.85225
G1 X142.483 Y122.589 E16.88226
G1 X141.332 Y122.687 E16.92069
G1 X141.011 Y122.696 E16.93137
G1 X140.725 Y122.7 E16.94088
G1 X79.52 Y122.699 E18.97657
G1 X78.822 Y122.69 E18.99978
G1 X77.921 Y122.639 E19.0298
G1 X77.027 Y122.507 E19.05986
G1 X76.149 Y122.298 E19.08987
G1 X75.292 Y122.011 E19.11993
G1 X74.465 Y121.65 E19.14995
G1 X73.672 Y121.217 E19.18
G1 X72.921 Y120.716 E19.21002
G1 X72.217 Y120.15 E19.24007
G1 X71.566 Y119.524 E19.27011
G1 X70.973 Y118.843 E19.30014
G1 X70.443 Y118.112 E19.33017
G1 X69.979 Y117.337 E19.36022
G1 X69.585 Y116.524 E19.39026
G1 X69.265 Y115.68 E19.42029
G1 X69.021 Y114.81 E19.45034
G1 X68.855 Y113.922 E19.48038
G1 X68.758 Y112.767 E19.51894
G1 X68.749 Y112.434 E19.53002
G1 X68.745 Y112.158 E19.5392
G1 X68.746 Y108.036 E19.67629
G1 X68.755 Y107.371 E19.69841
G1 X68.807 Y106.469 E19.72846
G1 X68.939 Y105.576 E19.75849
G1 X69.149 Y104.698 E19.78851
G1 X69.436 Y103.841 E19.81857
G1 X69.798 Y103.014 E19.8486
G1 X70.231 Y102.222 E19.87862
G1 X70.733 Y101.471 E19.90867
G1 X71.3 Y100.767 E19.93873
G1 X71.926 Y100.117 E19.96875
G1 X72.607 Y99.524 E19.99878
G1 X73.339 Y98.994 E20.02884
G1 F1500 E13.52884
;MESH:Mighty Bigery-Kup (2).stl
G0 F6000 X79.365 Y106.835
G0 X79.365 Y107.92
G0 X140.273 Y108.282
G0 X140.455 Y111.9
;TYPE:WALL-INNER
G1 F1500 E20.02884
G1 F1200 X79.545 Y111.9 E22.05471
G1 X79.545 Y108.1 E22.1811
G1 X140.455 Y108.1 E24.20698
G1 X140.455 Y111.9 E24.33337
G0 F6000 X140.855 Y112.3
;TYPE:WALL-OUTER
G1 F1200 X79.145 Y112.3 E26.38585
G1 X79.145 Y107.7 E26.53885
G1 X140.855 Y107.7 E28.59133
G1 X140.855 Y112.3 E28.74432
G0 F6000 X140.585 Y112.03
G0 X140.345 Y111.51
G0 X140.065 Y111.51
;TYPE:SKIN
G1 F1200 X79.935 Y111.51 E30.74426
G1 X79.935 Y108.49 E30.8447
G1 X140.065 Y108.49 E32.84463
G1 X140.065 Y111.51 E32.94508
G0 F6000 X140.345 Y111.51
G0 X140.345 Y108.791
G0 X139.904 Y108.791
G1 F1200 X139.762 Y108.649 E32.95176
G0 F6000 X139.196 Y108.649
G1 F1200 X139.904 Y109.357 E32.98506
G0 F6000 X139.904 Y109.923
G1 F1200 X138.631 Y108.649 E33.04496
G0 F6000 X138.065 Y108.649
G1 F1200 X139.904 Y110.488 E33.13146
G0 F6000 X139.904 Y111.054
G1 F1200 X137.499 Y108.649 E33.24459
G0 F6000 X136.934 Y108.649
G1 F1200 X139.633 Y111.349 E33.37156
G0 F6000 X139.068 Y111.349
G1 F1200 X136.368 Y108.649 E33.49856
G0 F6000 X135.802 Y108.649
G1 F1200 X138.502 Y111.349 E33.62556
G0 F6000 X137.936 Y111.349
G1 F1200 X135.237 Y108.649 E33.75254
G0 F6000 X134.671 Y108.649
G1 F1200 X137.371 Y111.349 E33.87954
G0 F6000 X136.805 Y111.349
G1 F1200 X134.105 Y108.649 E34.00654
G0 F6000 X133.539 Y108.649
G1 F1200 X136.239 Y111.349 E34.13354
G0 F6000 X135.673 Y111.349
G1 F1200 X132.974 Y108.649 E34.26051
G0 F6000 X132.408 Y108.649
G1 F1200 X135.108 Y111.349 E34.38751
G0 F6000 X134.542 Y111.349
G1 F1200 X131.842 Y108.649 E34.51451
G0 F6000 X131.277 Y108.649
G1 F1200 X133.976 Y111.349 E34.64149
G0 F6000 X133.411 Y111.349
G1 F1200 X130.711 Y108.649 E34.76849
G0 F6000 X130.145 Y108.649
G1 F1200 X132.845 Y111.349 E34.89549
G0 F6000 X132.279 Y111.349
G1 F1200 X129.58 Y108.649 E35.02247
G0 F6000 X129.014 Y108.649
G1 F1200 X131.714 Y111.349 E35.14947
G0 F6000 X131.148 Y111.349
G1 F1200 X128.448 Y108.649 E35.27647
G0 F6000 X127.883 Y108.649
G1 F1200 X130.582 Y111.349 E35.40344
G0 F6000 X130.017 Y111.349
G1 F1200 X127.317 Y108.649 E35.53044
G0 F6000 X126.751 Y108.649
G1 F1200 X129.451 Y111.349 E35.65744
G0 F6000 X128.885 Y111.349
G1 F1200 X126.186 Y108.649 E35.78442
G0 F6000 X125.62 Y108.649
G1 F1200 X128.32 Y111.349 E35.91142
G0 F6000 X127.754 Y111.349
G1 F1200 X125.054 Y108.649 E36.03842
G0 F6000 X124.488 Y108.649
G1 F1200 X127.188 Y111.349 E36.16542
G0 F6000 X126.623 Y111.349
G1 F1200 X123.923 Y108.649 E36.29242
G0 F6000 X123.357 Y108.649
G1 F1200 X126.057 Y111.349 E36.41942
G0 F6000 X125.491 Y111.349
G1 F1200 X122.791 Y108.649 E36.54642
G0 F6000 X122.226 Y108.649
G1 F1200 X124.925 Y111.349 E36.67339
G0 F6000 X124.36 Y111.349
G1 F1200 X121.66 Y108.649 E36.80039
G0 F6000 X121.094 Y108.649
G1 F1200 X123.794 Y111.349 E36.92739
G0 F6000 X123.228 Y111.349
G1 F1200 X120.529 Y108.649 E37.05437
G0 F6000 X119.963 Y108.649
G1 F1200 X122.663 Y111.349 E37.18137
G0 F6000 X122.097 Y111.349
G1 F1200 X119.397 Y108.649 E37.30837
G0 F6000 X118.832 Y108.649
G1 F1200 X121.531 Y111.349 E37.43534
G0 F6000 X120.966 Y111.349
G1 F1200 X118.266 Y108.649 E37.56234
G0 F6000 X117.7 Y108.649
G1 F1200 X120.4 Y111.349 E37.68934
G0 F6000 X119.834 Y111.349
G1 F1200 X117.135 Y108.649 E37.81632
G0 F6000 X116.569 Y108.649
G1 F1200 X119.269 Y111.349 E37.94332
G0 F6000 X118.703 Y111.349
G1 F1200 X116.003 Y108.649 E38.07032
G0 F6000 X115.438 Y108.649
G1 F1200 X118.137 Y111.349 E38.19729
G0 F6000 X117.572 Y111.349
G1 F1200 X114.872 Y108.649 E38.32429
G0 F6000 X114.306 Y108.649
G1 F1200 X117.006 Y111.349 E38.45129
G0 F6000 X116.44 Y111.349
G1 F1200 X113.74 Y108.649 E38.57829
G0 F6000 X113.175 Y108.649
G1 F1200 X115.875 Y111.349 E38.70529
G0 F6000 X115.309 Y111.349
G1 F1200 X112.609 Y108.649 E38.83229
G0 F6000 X112.043 Y108.649
G1 F1200 X114.743 Y111.349 E38.95929
G0 F6000 X114.177 Y111.349
G1 F1200 X111.478 Y108.649 E39.08627
G0 F6000 X110.912 Y108.649
G1 F1200 X113.612 Y111.349 E39.21327
G0 F6000 X113.046 Y111.349
G1 F1200 X110.346 Y108.649 E39.34027
G0 F6000 X109.781 Y108.649
G1 F1200 X112.48 Y111.349 E39.46724
G0 F6000 X111.915 Y111.349
G1 F1200 X109.215 Y108.649 E39.59424
G0 F6000 X108.649 Y108.649
G1 F1200 X111.349 Y111.349 E39.72124
G0 F6000 X110.783 Y111.349
G1 F1200 X108.084 Y108.649 E39.84822
G0 F6000 X107.518 Y108.649
G1 F1200 X110.218 Y111.349 E39.97522
G0 F6000 X109.652 Y111.349
G1 F1200 X106.952 Y108.649 E40.10222
G0 F6000 X106.387 Y108.649
G1 F1200 X109.086 Y111.349 E40.2292
G0 F6000 X108.521 Y111.349
G1 F1200 X105.821 Y108.649 E40.3562
G0 F6000 X105.255 Y108.649
G1 F1200 X107.955 Y111.349 E40.4832
G0 F6000 X107.389 Y111.349
G1 F1200 X104.689 Y108.649 E40.6102
G0 F6000 X104.124 Y108.649
G1 F1200 X106.824 Y111.349 E40.7372
G0 F6000 X106.258 Y111.349
G1 F1200 X103.558 Y108.649 E40.86419
G0 F6000 X102.992 Y108.649
G1 F1200 X105.692 Y111.349 E40.99119
G0 F6000 X105.126 Y111.349
G1 F1200 X102.427 Y108.649 E41.11817
G0 F6000 X101.861 Y108.649
G1 F1200 X104.561 Y111.349 E41.24517
G0 F6000 X103.995 Y111.349
G1 F1200 X101.295 Y108.649 E41.37217
G0 F6000 X100.73 Y108.649
G1 F1200 X103.429 Y111.349 E41.49915
G0 F6000 X102.864 Y111.349
G1 F1200 X100.164 Y108.649 E41.62615
G0 F6000 X99.598 Y108.649
G1 F1200 X102.298 Y111.349 E41.75315
G0 F6000 X101.732 Y111.349
G1 F1200 X99.033 Y108.649 E41.88012
G0 F6000 X98.467 Y108.649
G1 F1200 X101.167 Y111.349 E42.00712
G0 F6000 X100.601 Y111.349
G1 F1200 X97.901 Y108.649 E42.13412
G0 F6000 X97.336 Y108.649
G1 F1200 X100.035 Y111.349 E42.2611
G0 F6000 X99.47 Y111.349
G1 F1200 X96.77 Y108.649 E42.3881
G0 F6000 X96.204 Y108.649
G1 F1200 X98.904 Y111.349 E42.5151
G0 F6000 X98.338 Y111.349
G1 F1200 X95.639 Y108.649 E42.64207
G0 F6000 X95.073 Y108.649
G1 F1200 X97.773 Y111.349 E42.76907
G0 F6000 X97.207 Y111.349
G1 F1200 X94.507 Y108.649 E42.89607
G0 F6000 X93.941 Y108.649
G1 F1200 X96.641 Y111.349 E43.02307
G0 F6000 X96.076 Y111.349
G1 F1200 X93.376 Y108.649 E43.15007
G0 F6000 X92.81 Y108.649
G1 F1200 X95.51 Y111.349 E43.27707
G0 F6000 X94.944 Y111.349
G1 F1200 X92.244 Y108.649 E43.40407
G0 F6000 X91.679 Y108.649
G1 F1200 X94.378 Y111.349 E43.53105
G0 F6000 X93.813 Y111.349
G1 F1200 X91.113 Y108.649 E43.65805
G0 F6000 X90.547 Y108.649
G1 F1200 X93.247 Y111.349 E43.78505
G0 F6000 X92.681 Y111.349
G1 F1200 X89.982 Y108.649 E43.91202
G0 F6000 X89.416 Y108.649
G1 F1200 X92.116 Y111.349 E44.03902
G0 F6000 X91.55 Y111.349
G1 F1200 X88.85 Y108.649 E44.16602
G0 F6000 X88.285 Y108.649
G1 F1200 X90.984 Y111.349 E44.293
G0 F6000 X90.419 Y111.349
G1 F1200 X87.719 Y108.649 E44.42
G0 F6000 X87.153 Y108.649
G1 F1200 X89.853 Y111.349 E44.547
G0 F6000 X89.287 Y111.349
G1 F1200 X86.588 Y108.649 E44.67397
G0 F6000 X86.022 Y108.649
G1 F1200 X88.722 Y111.349 E44.80097
G0 F6000 X88.156 Y111.349
G1 F1200 X85.456 Y108.649 E44.92797
G0 F6000 X84.89 Y108.649
G1 F1200 X87.59 Y111.349 E45.05497
G0 F6000 X87.025 Y111.349
G1 F1200 X84.325 Y108.649 E45.18197
G0 F6000 X83.759 Y108.649
G1 F1200 X86.459 Y111.349 E45.30897
G0 F6000 X85.893 Y111.349
G1 F1200 X83.193 Y108.649 E45.43597
G0 F6000 X82.628 Y108.649
G1 F1200 X85.327 Y111.349 E45.56295
G0 F6000 X84.762 Y111.349
G1 F1200 X82.062 Y108.649 E45.68995
G0 F6000 X81.496 Y108.649
G1 F1200 X84.196 Y111.349 E45.81695
G0 F6000 X83.63 Y111.349
G1 F1200 X80.931 Y108.649 E45.94392
G0 F6000 X80.365 Y108.649
G1 F1200 X83.065 Y111.349 E46.07092
G0 F6000 X82.499 Y111.349
G1 F1200 X80.094 Y108.944 E46.18405
G0 F6000 X80.094 Y109.51
G1 F1200 X81.933 Y111.349 E46.27055
G0 F6000 X81.368 Y111.349
G1 F1200 X80.094 Y110.076 E46.33045
G0 F6000 X80.094 Y110.641
G1 F1200 X80.802 Y111.349 E46.36375
G0 F6000 X80.236 Y111.349
G1 F1200 X80.094 Y111.207 E46.37043
G0 F6000 X79.745 Y111.207
;TIME_ELAPSED:84.480884
G1 F1500 E39.87043
M140 S0
G91 ;Relative positioning
G1 E-2 F2700 ;Retract a bit
G1 E-2 Z0.2 F2400 ;Retract and raise Z
G1 X5 Y5 F3000 ;Wipe out
G1 Z10 ;Raise Z more
G90 ;Absolute positionning
G1 X0 Y220 ;Present print
M106 S0 ;Turn-off fan
M104 S0 ;Turn-off hotend
M140 S0 ;Turn-off bed
M84 X Y E ;Disable all steppers but Z
M82 ;absolute extrusion mode
M104 S0
;End of Gcode
;SETTING_3 {"global_quality": "[general]\\nversion = 4\\nname = Standard Quality
;SETTING_3 #2\\ndefinition = creality_base\\n\\n[metadata]\\nquality_type = sta
;SETTING_3 ndard\\ntype = quality_changes\\nsetting_version = 16\\n\\n[values]\\
;SETTING_3 n\\n", "extruder_quality": ["[general]\\nversion = 4\\nname = Standar
;SETTING_3 d Quality #2\\ndefinition = creality_ender3pro\\n\\n[metadata]\\nqual
;SETTING_3 ity_type = standard\\ntype = quality_changes\\nposition = 0\\nsetting
;SETTING_3 _version = 16\\n\\n[values]\\ninfill_sparse_density = 80\\n\\n"]}

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -73,7 +73,7 @@ namespace MyCore.Service.Controllers
[ProducesResponseType(typeof(string), 400)]
[ProducesResponseType(typeof(string), 404)]
[ProducesResponseType(typeof(string), 500)]
[HttpGet("detail/{alarmId}")]
[HttpGet("detail/{alarmModeId}")]
public ObjectResult GetDetail(string alarmModeId)
{
try
@ -186,7 +186,7 @@ namespace MyCore.Service.Controllers
}
/// <summary>
/// Activate current alarm mode
/// Activate specified alarm mode
/// </summary>
/// <param name="alarmModeId">Alarm mode to activate</param>
[ProducesResponseType(typeof(string), 202)]

View File

@ -44,42 +44,42 @@ namespace MyCore.Service.Controllers
/// </summary>
/// <param name="homeId">Home Id</param>
/// <param name="eventHomeFilter">Filter params</param>
[ProducesResponseType(typeof(List<EventDetailDTO>), 200)]
[ProducesResponseType(typeof(ListResponse<EventDetailDTO, EventHomeFilter>), 200)]
[ProducesResponseType(typeof(string), 500)]
[HttpGet("{homeId}")]
public ObjectResult Get(string homeId, [FromQuery] EventHomeFilter eventHomeFilter) // TODO Add filter by date etc
{
try
{
List<Event> events = _EventDatabaseService.GetAll(homeId); // To check if best
IQueryable<Event> events = _EventDatabaseService.GetAll(homeId); // To check if best
if (eventHomeFilter.EventType != null)
{
events = events.Where(e => e.Type == eventHomeFilter.EventType).OrderBy(e => e.Date).ToList();
events = events.Where(e => e.Type == eventHomeFilter.EventType).OrderByDescending(e => e.Date);
}
if (eventHomeFilter.DeviceType != null)
{
events = events.Where(e => e.DeviceState.DeviceType == eventHomeFilter.DeviceType).OrderBy(e => e.Date).ToList();
events = events.Where(e => e.DeviceState.DeviceType == eventHomeFilter.DeviceType).OrderByDescending(e => e.Date);
}
if (eventHomeFilter.DeviceId != null)
{
events = events.Where(e => e.DeviceState.DeviceId == eventHomeFilter.DeviceId).OrderBy(e => e.Date).ToList();
events = events.Where(e => e.DeviceState.DeviceId == eventHomeFilter.DeviceId).OrderByDescending(e => e.Date);
}
if (eventHomeFilter.RoomId != null)
{
events = events.Where(e => e.RoomId == eventHomeFilter.RoomId).OrderBy(e => e.Date).ToList();
events = events.Where(e => e.RoomId == eventHomeFilter.RoomId).OrderByDescending(e => e.Date);
}
if (eventHomeFilter.DateStart != null && eventHomeFilter.DateEnd != null) {
events = events.Where(e => e.Date >= eventHomeFilter.DateStart && e.Date < eventHomeFilter.DateEnd).OrderBy(e => e.Date).ToList();
events = events.Where(e => e.Date >= eventHomeFilter.DateStart && e.Date < eventHomeFilter.DateEnd).OrderByDescending(e => e.Date);
}
var totalCount = events.Count();
events = events.Skip(eventHomeFilter.StartIndex).Take(eventHomeFilter.Count).ToList();
events = events.Skip(eventHomeFilter.StartIndex).Take(eventHomeFilter.Count);
List<EventDetailDTO> eventDTOs = events.Select(d => d.ToDetailDTO()).OrderBy(e => e.Date).ToList();
List<EventDetailDTO> eventDTOs = events.ToList().Select(d => d.ToDetailDTO()).OrderByDescending(e => e.Date).ToList();
var lr = new ListResponse<EventDetailDTO, EventHomeFilter>(eventDTOs, eventHomeFilter);
lr.TotalCount = totalCount;

View File

@ -36,6 +36,12 @@ namespace MyCore.Services.Devices
new SupportedDevice { Manufacturer = "Ikea", Model = "E1524/E1810", Description = "TRADFRI remote control", DeviceType = DeviceType.Switch },
new SupportedDevice { Manufacturer = "SONOFF", Model = "BASICZBR3", Description = "Zigbee smart switch", DeviceType = DeviceType.Switch },
new SupportedDevice { Manufacturer = "Philips", Model = "8718696743133", Description = "Hue tap", DeviceType = DeviceType.Switch },
new SupportedDevice { Manufacturer = "Neo", Model = "NAS-AB02B0", Description = "Temperature & humidity sensor and alarm", DeviceType = DeviceType.Sound },
new SupportedDevice { Manufacturer = "TuYa", Model = "TS0201", Description = "Temperature & humidity sensor with display", DeviceType = DeviceType.Environment },
};
public static DeviceDetailDTO CreateOrUpdate(DeviceDatabaseService _DeviceDatabaseService, ProviderDatabaseService _ProviderDatabaseService, RoomDatabaseService _RoomDatabaseService, string homeId, DeviceDetailDTO deviceDetailDTO, bool create, bool isZigbee = false)

View File

@ -18,9 +18,9 @@ namespace MyCore.Services
var database = client.GetDatabase("MyCoreDb");
_Events = database.GetCollection<Event>("Events");
}
public List<Event> GetAll(string homeId)
public IQueryable<Event> GetAll(string homeId)
{
return _Events.Find(d => d.HomeId == homeId).ToList();
return _Events.AsQueryable().Where(d => d.HomeId == homeId);
}
public List<Event> GetEventType(EventType? eventType)