Skip to content

Commit b0862e8

Browse files
wm-eisoswm-eisos
committed
Release 2.0.0
1 parent 6059ad9 commit b0862e8

144 files changed

Lines changed: 12775 additions & 8449 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ root = true
33

44
[*]
55
charset = utf-8
6-
indent_style = space
7-
indent_size = 2
6+
indent_style = tab
7+
indent_size = tab
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

‎.githooks/pre-commit‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
#
3+
4+
if [ `git rev-parse --abbrev-ref HEAD` != "release" ]; then
5+
exit 0
6+
fi
7+
8+
echo 'Generating CHANGELOG.md file'
9+
10+
npx html-to-markdown ./src/assets/whatsnew/whatsnew.html --output="." && mv whatsnew.html.md CHANGELOG.md && git add CHANGELOG.md
11+
12+
# Check the return code
13+
if [ $? -eq 1 ]; then
14+
# Error
15+
echo "Failed to generate CHANGELOG.md file"
16+
exit 1
17+
else
18+
exit 0
19+
fi

‎.github/workflows/executable.yaml‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
name: Build Executables
2+
run-name: "${{ github.ref_name }}"
3+
4+
on:
5+
push:
6+
tags:
7+
- "v*.*"
8+
- "v*.*.*"
9+
10+
jobs:
11+
build-windows:
12+
runs-on: ${{ matrix.runner }}
13+
strategy:
14+
matrix:
15+
runner: [windows-latest]
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
- name: Install dependencies
20+
run: |
21+
npm install
22+
npm install -g @ionic/cli
23+
cd "${env:GITHUB_WORKSPACE}\electron"
24+
npm install
25+
- name: Ionic production build
26+
run: |
27+
ionic build --prod
28+
- name: Capacitor copy to @capacitor-community/electron
29+
run: |
30+
npx cap copy @capacitor-community/electron
31+
- name: Build Capacitor Electron
32+
run: |
33+
cd "${env:GITHUB_WORKSPACE}\electron"
34+
npm run electron:make
35+
cd "${env:GITHUB_WORKSPACE}\electron\dist"
36+
dir
37+
- name: Upload built files
38+
uses: actions/upload-artifact@v4
39+
with:
40+
name: ${{ matrix.runner }}
41+
path: |
42+
${{ github.workspace }}/electron/dist/*.exe
43+
if-no-files-found: error
44+
45+
build-linux:
46+
runs-on: ${{ matrix.runner }}
47+
strategy:
48+
matrix:
49+
runner: [ubuntu-latest]
50+
51+
steps:
52+
- name: Checkout code
53+
uses: actions/checkout@v4
54+
- name: Install depedencies
55+
run: |
56+
npm install
57+
npm install -g @ionic/cli
58+
cd '${{ github.workspace }}/electron'
59+
npm install
60+
- name: Ionic production build
61+
run: |
62+
ionic build --prod
63+
- name: Capacitor copy to @capacitor-community/electron
64+
run: |
65+
npx cap copy @capacitor-community/electron
66+
- name: Build Capacitor Electron
67+
run: |
68+
cd '${{ github.workspace }}/electron'
69+
npm run electron:make
70+
cd '${{ github.workspace }}/electron/dist'
71+
ls
72+
- name: Upload built files
73+
uses: actions/upload-artifact@v4
74+
with:
75+
name: ${{ matrix.runner }}
76+
path: |
77+
${{ github.workspace }}/electron/dist/*.AppImage
78+
${{ github.workspace }}/electron/dist/*.deb
79+
if-no-files-found: error
80+
81+
build-macos:
82+
runs-on: ${{ matrix.runner }}
83+
strategy:
84+
matrix:
85+
runner: [macos-latest]
86+
steps:
87+
- name: Checkout code
88+
uses: actions/checkout@v4
89+
- name: Install depedencies
90+
run: |
91+
npm install
92+
npm install -g @ionic/cli
93+
cd '${{ github.workspace }}/electron'
94+
npm install
95+
- name: Ionic production build
96+
run: |
97+
ionic build --prod
98+
- name: Capacitor copy to @capacitor-community/electron
99+
run: |
100+
npx cap copy @capacitor-community/electron
101+
- name: Build Capacitor Electron
102+
run: |
103+
cd '${{ github.workspace }}/electron'
104+
npm run electron:make
105+
cd '${{ github.workspace }}/electron/dist'
106+
ls
107+
- name: Upload built files
108+
uses: actions/upload-artifact@v4
109+
with:
110+
name: ${{ matrix.runner }}
111+
path: |
112+
${{ github.workspace }}/electron/dist/*.pkg
113+
${{ github.workspace }}/electron/dist/*.dmg
114+
if-no-files-found: error
115+
116+
release:
117+
needs: [build-windows, build-linux, build-macos]
118+
if: ${{ always() && !failure() }}
119+
runs-on: ubuntu-latest
120+
steps:
121+
- name: Download all artifacts
122+
uses: actions/download-artifact@v4
123+
with:
124+
path: ./artifacts
125+
126+
- name: Release
127+
uses: softprops/action-gh-release@v2
128+
with:
129+
files: ./artifacts/**/*
130+
131+
permissions:
132+
contents: write
133+

.github/workflows/main.yaml renamed to .github/workflows/web-app.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
name: Build and Deploy
1+
name: Web App Build and Deploy
2+
23
on:
34
push:
4-
branches:
5-
- release
5+
tags:
6+
- "v*.*"
7+
- "v*.*.*"
8+
69
jobs:
710
build:
811

‎CHANGELOG.md‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
**Version 2.0.0**\
2+
\
3+
\[FIX] Read full device name during conection setup.\
4+
\[FIX] RSSI values now update during scanning.\
5+
\[FIX] Proteus modules commands order is respected.\
6+
\[NEW] Add support for multiple Service UUIDs filteration simultaneously.\
7+
\[NEW] Update internal frameworks.\
8+
\[NEW] Add macros support.\
9+
\
10+
**Version 1.9**\
11+
\
12+
\[FIX] Improve Bluetooth LE permissions check.\
13+
\[NEW] Add Windows Executable build.\
14+
\[NEW] Add support for CYSPP profile and Skoll-I.\
15+
\
16+
**Version 1.8**\
17+
\
18+
\[FIX] Check for minimum WebView version in Android.\
19+
\[FIX] Improved ASCII data handling.\
20+
\[FIX] Corrected configuration of PWA (Progressive Web App).\
21+
\[NEW] Change app name to WE Bluetooth LE Terminal.\
22+
\
23+
**Version 1.7**\
24+
\
25+
\[FIX] Check for WE SPP-like profile when establishing connection.\
26+
\[NEW] Update internal frameworks.\
27+
\
28+
**Version 1.6**\
29+
\
30+
\[FIX] Internal restructuring of code.\
31+
\[NEW] Add scan filters.\
32+
\[NEW] Add byte counter for payload.\
33+
\[NEW] Add ability to send multiple packets with interval.\
34+
\[NEW] Add new Proteus CMD\_GETSTATE\_REQ and CMD\_GETSTATE\_CNF support.\
35+
\
36+
**Version 1.5**\
37+
\
38+
\[FIX] Add check for bluetooth state.\
39+
\[NEW] Split bytes in hex input mode.\
40+
\
41+
**Version 1.4**\
42+
\
43+
\[FIX] Fixed requesting bluetooth permissions on Android 12.\
44+
\[NEW] Added support for PWM gpio pins.\
45+
\[NEW] Use monospace font for hex data.\
46+
\[NEW] Add support for more boards.\
47+
\[NEW] Complete app rewrite.\
48+
\
49+
**Version 1.3**\
50+
\
51+
\[FIX] Source code was moved to another git location. Adopted included links.\
52+
\
53+
**Version 1.2**\
54+
\
55+
\[FIX] Fixed logging of very first character in case of ascii payload\
56+
\
57+
**Version 1.1**\
58+
\
59+
\[FIX] Fixed send ASCII payload\
60+
\
61+
**Version 1.0**\
62+
\
63+
\[NEW] This is the official first version of the Proteus Connect app. We hope you enjoy it.

‎README.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ For other ways to install Capacitor Framework by Ionic, refer to https://capacit
3434
| :--------: | :-----: |
3535
| Angular | 16 |
3636
| Ionic | 8 |
37-
| Capacitor | 6 |
37+
| Capacitor | 7 |
3838

3939
| Platform | IDE | Target SDK Version | Minimum SDK Version |
4040
| :------: | :------------------------: | :----------------: | :-----------------: |
@@ -68,13 +68,21 @@ ionic cap build android --prod
6868

6969
This will build the project for the specified platform and open the native IDE (Android Studio or Xcode).
7070

71-
### Generating Windows Executable
71+
### Generating Executables
7272

7373
---
7474
**NOTE**
7575

7676
It is recommened to use the web app, however this is useful when the tool is intended to be run on a device without internet connection.
7777

78+
The resulting executable depends on which OS were these commands ran on.
79+
80+
| OS | Build Output |
81+
| :------- | :-------------- |
82+
| Windows | exe |
83+
| macOS | dmg, pkg |
84+
| Linux | AppImage, deb |
85+
7886
---
7987

8088
Navigate to ```./electron``` directory and run the following to install the dependencies for electron

‎WE-Bluetooth-Terminal-LE.code-workspace‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"folders": [
3+
{
4+
"name": "Source Code",
5+
"path": "src"
6+
},
7+
{
8+
"name": "Android Project",
9+
"path": "android"
10+
},
11+
{
12+
"name": "iOS Project",
13+
"path": "ios"
14+
},
15+
{
16+
"name": "Electron Project",
17+
"path": "electron"
18+
}
19+
],
20+
"settings": {
21+
"files.exclude": {
22+
"**/.git": true,
23+
"**/.DS_Store": true,
24+
"**/node_modules": true
25+
},
26+
"editor.defaultFormatter": "esbenp.prettier-vscode",
27+
"editor.formatOnSave": true,
28+
"typescript.tsdk": "node_modules/typescript/lib"
29+
},
30+
"extensions": {
31+
"recommendations": [
32+
"esbenp.prettier-vscode",
33+
],
34+
"unwantedRecommendations": [
35+
"vscjava.vscode-java-pack"
36+
]
37+
}
38+
}

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.eisos.android.terminal"
99
minSdkVersion rootProject.ext.minSdkVersion
1010
targetSdkVersion rootProject.ext.targetSdkVersion
11-
versionCode 250206
12-
versionName "1.9"
11+
versionCode 250729
12+
versionName "2.0.0"
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
aaptOptions {
1515
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

‎android/app/capacitor.build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_17
6-
targetCompatibility JavaVersion.VERSION_17
5+
sourceCompatibility JavaVersion.VERSION_21
6+
targetCompatibility JavaVersion.VERSION_21
77
}
88
}
99

@@ -13,10 +13,13 @@ dependencies {
1313
implementation project(':capacitor-app')
1414
implementation project(':capacitor-browser')
1515
implementation project(':capacitor-device')
16+
implementation project(':capacitor-filesystem')
1617
implementation project(':capacitor-haptics')
1718
implementation project(':capacitor-keyboard')
1819
implementation project(':capacitor-preferences')
1920
implementation project(':capacitor-status-bar')
21+
implementation project(':capawesome-capacitor-android-edge-to-edge-support')
22+
implementation project(':capawesome-capacitor-file-picker')
2023

2124
}
2225

‎android/app/src/debug/AndroidManifest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
3+
<uses-permission android:name="android.permission.INTERNET" />
4+
</manifest>

0 commit comments

Comments
 (0)