PolyCraft/kiln-controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: PolyCraft:main
Branches Tags
PolyCraft:main
PolyCraft:revert-168-master
PolyCraft:master
PolyCraft:kiln-profiles
...
pull from: PolyCraft:revert-168-master
Branches Tags
PolyCraft:main
PolyCraft:revert-168-master
PolyCraft:master
PolyCraft:kiln-profiles

5 Commits
main ... revert-168

Author SHA1 Message Date
Jason Bruce
0958eddbfb
Revert "profile filetype checks" 2024-07-02 13:57:11 -04:00
Jason Bruce
2e756178dc
Merge pull request #168 from SamSkjord/master 
profile filetype checks
 2024-07-02 13:56:42 -04:00
Sam
96e5919464 profile filetype checks 
Added my Controller as a samba share so I could edit profile files remotely, as OSX is very aggressive about shoving ._ files where you don't want them,
I added a check for that and another check to make sure to only try and open files ending in .json
 2024-01-23 14:23:57 +00:00
jbruce
7c7a1b648e remove the loading message 2022-12-16 14:21:37 -05:00
jbruce
f0c97ed220 make hours the tick size on the live graph always 2022-12-16 09:49:19 -05:00
2 changed files with 20 additions and 20 deletions
Show Stats Expand all files Collapse all files

2
config.py
View File

@ -107,7 +107,7 @@ sim_R_ho_air = 0.05 # K/W " with internal air circulation
temp_scale = "f" # c = Celsius | f = Fahrenheit - Unit to display temp_scale = "f" # c = Celsius | f = Fahrenheit - Unit to display
time_scale_slope = "h" # s = Seconds | m = Minutes | h = Hours - Slope displayed in temp_scale per time_scale_slope time_scale_slope = "h" # s = Seconds | m = Minutes | h = Hours - Slope displayed in temp_scale per time_scale_slope
time_scale_profile = "h" # s = Seconds | m = Minutes | h = Hours - Enter and view target time in time_scale_profile time_scale_profile = "m" # s = Seconds | m = Minutes | h = Hours - Enter and view target time in time_scale_profile
# emergency shutoff the profile if this temp is reached or exceeded. # emergency shutoff the profile if this temp is reached or exceeded.
# This just shuts off the profile. If your SSR is working, your kiln will # This just shuts off the profile. If your SSR is working, your kiln will

38
public/assets/js/picoreflow.js
View File

@ -368,14 +368,14 @@ function saveProfile()
} }
function get_tick_size() { function get_tick_size() {
switch(time_scale_profile){ //switch(time_scale_profile){
case "s": // case "s":
return 1; // return 1;
case "m": // case "m":
return 60; // return 60;
case "h": // case "h":
return 3600; // return 3600;
} // }
return 3600; return 3600;
} }
@ -473,17 +473,17 @@ $(document).ready(function()
{ {
console.log("Status Socket has been opened"); console.log("Status Socket has been opened");
$.bootstrapGrowl("<span class=\"glyphicon glyphicon-exclamation-sign\"></span>Getting data from server", // $.bootstrapGrowl("<span class=\"glyphicon glyphicon-exclamation-sign\"></span>Getting data from server",
{ // {
ele: 'body', // which element to append to // ele: 'body', // which element to append to
type: 'success', // (null, 'info', 'error', 'success') // type: 'success', // (null, 'info', 'error', 'success')
offset: {from: 'top', amount: 250}, // 'top', or 'bottom' // offset: {from: 'top', amount: 250}, // 'top', or 'bottom'
align: 'center', // ('left', 'right', or 'center') // align: 'center', // ('left', 'right', or 'center')
width: 385, // (integer, or 'auto') // width: 385, // (integer, or 'auto')
delay: 2500, // delay: 2500,
allow_dismiss: true, // allow_dismiss: true,
stackup_spacing: 10 // spacing between consecutively stacked growls. // stackup_spacing: 10 // spacing between consecutively stacked growls.
}); // });
}; };
ws_status.onclose = function() ws_status.onclose = function()