Skip to content

update to latest iris 👍 #1

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
hiveminded wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to latest iris 👍 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions calibrate/calibrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import (
"regexp"

"github.com/kataras/iris"
// you can omit the context import statement and use `iris.Context` if go > 1.9
"github.com/kataras/iris/context"

"github.com/murdinc/ELMFlash/hexstuff"
"github.com/toqueteos/webbrowser"
)
Expand Down Expand Up @@ -184,7 +187,7 @@ func GetMaps(block []byte) []int {
return addresses
}

func index(ctx *iris.Context) {
func index(ctx context.Context) {
payload := make(map[string]interface{})

var tables []Table
Expand Down Expand Up @@ -214,7 +217,8 @@ func index(ctx *iris.Context) {
payload["Tables"] = tables
payload["Errors"] = nil

ctx.Render("templates/calibrate.html", Content{Title: "Calibrate", Payload: payload, Calibration: "MSP/MP3", RenderLayout: true})
ctx.ViewData("", Content{Title: "Calibrate", Payload: payload, Calibration: "MSP/MP3", RenderLayout: true})
ctx.View("templates/calibrate.html")
}

type Table struct {
Expand Down Expand Up @@ -247,7 +251,7 @@ type Table struct {
Data []int
}

func getTable(ctx *iris.Context) {
func getTable(ctx context.Context) {
payload := make(map[string]interface{})

calibration := New("mp3")
Expand All @@ -256,7 +260,7 @@ func getTable(ctx *iris.Context) {
payload["Table"] = table
payload["Errors"] = nil

ctx.JSONP(iris.StatusOK, "callbackName", Content{Title: "Calibrate", Payload: payload, Calibration: "MSP/MP3", RenderLayout: true})
ctx.JSONP("callbackName", Content{Title: "Calibrate", Payload: payload, Calibration: "MSP/MP3", RenderLayout: true})
}

// 0x10AA60
Expand Down
Empty file removed program_output/COMMON_ID2016-06-03T21:47:47-07:00.BIN
View file
Open in desktop
Empty file.