Skip to content

Implement step time and slope input #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Implement step time and slope input #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bc31f
Implement log route
miko-kiiski-r Aug 5, 2025
499bc25
Implement step time and slope input
gadgetmies Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions kiln-controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ def handle_status():
log.info("websocket (status) closed")


@app.get('/log')
def handle_log():
log.info("/log command received")
if hasattr(oven,'pid'):
if hasattr(oven.pid,'pidstats'):
return json.dumps(ovenWatcher.lastlog())


def get_profiles():
try:
profile_files = os.listdir(profile_path)
Expand Down
3 changes: 3 additions & 0 deletions lib/ovenWatcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ def run(self):
self.notify_all(oven_state)
time.sleep(self.oven.time_step)

def lastlog(self):
return self.last_log

def lastlog_subset(self,maxpts=50):
'''send about maxpts from lastlog by skipping unwanted data'''
totalpts = len(self.last_log)
Expand Down
54 changes: 31 additions & 23 deletions public/assets/js/picoreflow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ function updateProfileTable()
var slope = "";
var color = "";

var html = '<h3>Schedule Points</h3><div class="table-responsive" style="scroll: none"><table class="table table-striped">';
html += '<tr><th style="width: 50px">#</th><th>Target Time in ' + time_scale_long+ '</th><th>Target Temperature in °'+temp_scale_display+'</th><th>Slope in &deg;'+temp_scale_display+'/'+time_scale_slope+'</th><th></th></tr>';
var html = '<h3>Schedule Points</h3><div class="table-responsive" style="scroll: none">'
html +='<table class="table table-striped">';
html += '<tr><th style="width: 50px">#</th><th>Step Duration in ' + time_scale_long+ '</th><th>Step Time in ' + time_scale_long+ '</th><th>Target Temperature in °'+temp_scale_display+'</th><th>Slope in &deg;'+temp_scale_display+'/'+time_scale_slope+'</th><th></th></tr>';

for(var i=0; i<graph.profile.data.length;i++)
{
Expand All @@ -120,9 +121,10 @@ function updateProfileTable()
if (dps == 0) { slope = "right"; color="grey"; }

html += '<tr><td><h4>' + (i+1) + '</h4></td>';
html += '<td><input type="text" class="form-control" id="profiletable-0-'+i+'" value="'+ timeProfileFormatter(graph.profile.data[i][0],true) + '" style="width: 60px" /></td>';
html += '<td><input type="text" class="form-control" id="profiletable-1-'+i+'" value="'+ graph.profile.data[i][1] + '" style="width: 60px" /></td>';
html += '<td><div class="input-group"><span class="glyphicon glyphicon-circle-arrow-' + slope + ' input-group-addon ds-trend" style="background: '+color+'"></span><input type="text" class="form-control ds-input" readonly value="' + formatDPS(dps) + '" style="width: 100px" /></div></td>';
html += '<td><input type="' + (i === 0 ? 'hidden' : 'text') + '" class="form-control" id="profiletable-duration-'+i+'" value="'+ timeProfileFormatter(i === 0 ? 0 : graph.profile.data[i][0] - graph.profile.data[i-1][0],true) + '" style="width: 60px" /></td>';
html += '<td><input type="' + (i === 0 ? 'hidden' : 'text') + '" class="form-control" id="profiletable-time-'+i+'" value="'+ timeProfileFormatter(graph.profile.data[i][0],true) + '" style="width: 60px" /></td>';
html += '<td><input type="text" class="form-control" id="profiletable-temperature-'+i+'" value="'+ graph.profile.data[i][1] + '" style="width: 60px" /></td>';
html += '<td><div class="input-group"><span class="glyphicon glyphicon-circle-arrow-' + slope + ' input-group-addon ds-trend" style="background: '+color+'"></span><input type="text" class="form-control ds-input" id="profiletable-slope-'+i+'" value="' + formatDPS(dps) + '" style="width: 100px" /></div></td>';
html += '<td>&nbsp;</td></tr>';
}

Expand All @@ -136,46 +138,52 @@ function updateProfileTable()
var id = $(this)[0].id; //e.currentTarget.attributes.id
var value = parseInt($(this)[0].value);
var fields = id.split("-");
var col = parseInt(fields[1]);
var row = parseInt(fields[2]);

if (graph.profile.data.length > 0) {
if (col == 0) {
graph.profile.data[row][col] = timeProfileFormatter(value,false);
}
else {
graph.profile.data[row][col] = value;
if (fields[1] === 'time') {
if (graph.profile.data.length > 0) {
graph.profile.data[row][0] = timeProfileFormatter(value, false);
}
} else if (fields[1] === 'temperature') {
graph.profile.data[row][1] = value;
} else if (fields[1] === 'duration') {
graph.profile.data[row][0] = graph.profile.data[row-1][0] + timeProfileFormatter(value, false);
} else if (fields[1] === 'slope') {
console.log({value, formatted: formatDPS(value, true), start_temp: graph.profile.data[row-1][1], end_temp: graph.profile.data[row][1], start_time: graph.profile.data[row-1][0]})
graph.profile.data[row][0] = (graph.profile.data[row][1] - graph.profile.data[row-1][1]) / formatDPS(value, true) + graph.profile.data[row-1][0]
}

graph.plot = $.plot("#graph_container", [ graph.profile, graph.live ], getOptions());
}
updateProfileTable();

updateProfileTable();
});
}

function timeProfileFormatter(val, down) {
var rval = val
switch(time_scale_profile){
case "m":
if (down) {rval = val / 60;} else {rval = val * 60;}
rval = down ? val / 60 : val * 60;
break;
case "h":
if (down) {rval = val / 3600;} else {rval = val * 3600;}
rval = down ? val / 3600 : val * 3600;
break;
}
return Math.round(rval);
}

function formatDPS(val) {
function formatDPS(val, down = false) {
var tval = val;
if (time_scale_slope == "m") {
tval = val * 60;
}
if (time_scale_slope == "h") {
tval = (val * 60) * 60;
switch(time_scale_slope){
case "m":
tval = down ? val / 60 : val * 60;
break;
case "h":
tval = down ? val / 60 / 60 : (val * 60) * 60;
break;
}
return Math.round(tval);

return down ? tval : Math.round(tval);
}

function hazardTemp(){
Expand Down