Skip to content

Commit

Permalink
Merge branch 'release/2.0.0-beta.9' into feature/2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-holder-revvity committed Sep 3, 2024
2 parents 1f931ad + 6d6a632 commit 01eb07b
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

/cypress/videos/
/cypress/screenshots/
cypress/videos/
cypress/screenshots/

# Editor directories and files
.idea
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

/cypress/videos/
/cypress/screenshots/
cypress/videos/
cypress/screenshots/

# Editor directories and files
.idea
Expand Down
5 changes: 5 additions & 0 deletions PLAN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- v2.1
- Switch the majority of the IPC using tRPC.
- Level uses a streaming IPC.
- Anything passing a file may still require some custom hanlding.
- More drivers.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ the execution permission and run it. It is recommended that you use
something like the `appimagelauncher` to better integrate it with
you desktop environment.

### Requirements

Currently, BridgeCmdr requires a 32-bit version of Raspberry Pi OS, at least v11, a.k.a. `bullseye`, or later with
FUSE v2 installed.

### System Requirements

I've only tested this software on a Raspberry Pi 3 Model B+. In general I would recommend at minimal a Raspberry Pi 3
Expand Down Expand Up @@ -121,7 +126,7 @@ based operating system is required. The following steps will get you setup on a

- For hot-reload development mode: `yarn dev`
- For product builds: `yarn build`
- For packaged application: `yarn package`
- For packaged application: `yarn make`

### Docker and ARM support

Expand Down
5 changes: 5 additions & 0 deletions example.dev-app-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
owner: 6XGate
repo: bridgecmdr
provider: github
protocol: https
updaterCacheDirName: bridgecmdr-updater
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bridgecmdr",
"productName": "BridgeCmdr",
"version": "2.0.0-beta.8",
"version": "2.0.0-beta.9",
"description": "Controller for professional A/V monitors and switches",
"packageManager": "[email protected]",
"type": "module",
Expand Down
2 changes: 2 additions & 0 deletions prettier.config.cjs
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/* eslint-env node */
'use strict'
module.exports = require('@sixxgate/lint/prettier.config.cjs')
Empty file removed resources/.empty
Empty file.
1 change: 1 addition & 0 deletions src/core/error-handling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export function getZodMessage(e: z.ZodError) {
export function getMessage(cause: unknown) {
if (cause instanceof Error) return cause.message
if (cause == null) return `BadError: ${cause}`
if (typeof cause === 'string') return cause
if (typeof cause !== 'object') return String(cause)
if (!('message' in cause)) return `BadError: ${Object.prototype.toString.call(cause)}`
if (typeof cause.message !== 'string') return String(cause.message)
Expand Down
2 changes: 1 addition & 1 deletion src/main/system/updater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const useUpdater = memo(() => {
autoUpdater.forceDevUpdateConfig = true
// FIXME: Find some way to prevent if from logging
// errors that are caught and handled.
//autoUpdater.logger = Logger
// autoUpdater.logger = Logger

/**
* Application auto update.
Expand Down

0 comments on commit 01eb07b

Please sign in to comment.