Skip to content

Commit

Permalink
Merge pull request #48 from NoxHarmonium/brew-session-steps
Browse files Browse the repository at this point in the history
feat: session view
  • Loading branch information
NoxHarmonium authored Sep 3, 2021
2 parents 66a0be3 + 3120fb6 commit 3d527ff
Show file tree
Hide file tree
Showing 64 changed files with 7,640 additions and 1,111 deletions.
12 changes: 6 additions & 6 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"env": {
"myDefaultIncludePath": [
"${workspaceFolder}",
"${workspaceFolder}/include/CIncludes",
"${workspaceFolder}/include/ThinkCIncludes"
"${workspaceFolder}/include/CIncludes"
]
},
"configurations": [
Expand All @@ -13,14 +12,15 @@
"${myDefaultIncludePath}"
],
"defines": [
"FOO",
"BAR=100"
"TARGET_OS_MAC",
"OLDROUTINENAMES"
],
"forcedInclude": [
"${workspaceFolder}/include/MacIncludes.h"
"${workspaceFolder}/include/MacIncludes.h",
"${workspaceFolder}/include/CIncludes/Carbon.h"
],
"cStandard": "c89"
}
],
"version": 4
}
}
21 changes: 18 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@
"mbtypes.h": "c",
"string": "cpp",
"cstring": "c",
"mbdsessionlist.h": "c"
}
}
"mbdsessionlist.h": "c",
"events.h": "c",
"string_view": "c",
"mbwviewsession.h": "c",
"*.tcc": "c",
"cstdio": "c",
"string.h": "c",
"stdio.h": "c",
"textutils.h": "c",
"quickdraw.h": "c",
"mbserial.h": "c",
"controldefinitions.h": "c",
"mbutil.h": "c"
},
"c-cpp-flylint.clang.enable": false,
"c-cpp-flylint.flexelint.enable": false,
"c-cpp-flylint.lizard.enable": false
}
2 changes: 1 addition & 1 deletion Images/basilisk_ii_prefs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ displaycolordepth 0
disk ./system710-macbrew-dev-with-code.image
extfs /
screen win/512/384
seriala /dev/pts/1
seriala /dev/pts/4
serialb /dev/ttyS1
udptunnel false
udpport 6066
Expand Down
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@ how software was developed 30 years ago.

Bonus points if it helps me brew better beer.

## Status

I'm working my way towards brewing a beer with
just macbrew as an aid.

Once I have a recipe view I should be able to do that.

- [x] Load basic Brew Session data
- [x] Generate brewing steps
- [ ] Show recipe

## Components

### macbrew-proxy
A modern application written in Rust that
will run on a Raspberry Pi
Expand Down Expand Up @@ -63,6 +76,8 @@ Some screenshots of the work in progress:

![Screenshot of the splash screen](./docs/splash.png "Screenshot of the splash screen")
![Screenshot of the session list](./docs/session-list.png "Screenshot of the session list")
![Screenshot of the session view](./docs/session-view.png "Screenshot of the session view")
![Screenshot of the steps list](./docs/step-list.png "Screenshot of the steps list")

## License

Expand Down
Binary file modified docs/session-list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/session-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/step-list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions include/MacIncludes.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
#endif

// BDC
#if 1
#if 0
#include <BDC.h>
#endif

Expand Down Expand Up @@ -489,22 +489,22 @@
#endif

// pascal.h
#if 1
#if 0
#include <pascal.h>
#endif

// asm.h
#if 1
#if 0
#include <asm.h>
#endif

// LoMem
#if 1
#if 0
#include <LoMem.h>
#endif

// THINK
#if 1
#if 0
#include <THINK.h>
#endif

Expand Down
28 changes: 0 additions & 28 deletions include/ThinkCIncludes/BDC.h

This file was deleted.

203 changes: 0 additions & 203 deletions include/ThinkCIncludes/LoMem.h

This file was deleted.

Loading

0 comments on commit 3d527ff

Please sign in to comment.