Skip to content
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.

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

Pin-Anpassungen für Heltec Lora Devices #15

Open
wants to merge 112 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
b990a71
Create hani-mandl-wiring_corresponding-to-code-v0.1.3_v0.1.fzz
ClemensGruber Feb 16, 2019
65fb760
Add files via upload
ClemensGruber Feb 16, 2019
c13a069
Update hani-mandl_v0.1.4.ino
ClemensGruber Feb 17, 2019
19bdfd0
Delete hani-mandl-wiring_corresponding-to-code-v0.1.4_v0.2.fzz
ClemensGruber Feb 17, 2019
6c89ee4
Add files via upload
ClemensGruber Feb 17, 2019
7e1fe42
Add files via upload
ClemensGruber Feb 17, 2019
0e3331b
Delete hani-mandl-wiring_corresponding-to-code-v0.1.4_v0.2.1.png
ClemensGruber Feb 17, 2019
76f80c0
Add files via upload
ClemensGruber Feb 17, 2019
2342209
Add files via upload
ClemensGruber Feb 17, 2019
12e7d4a
Delete HX711.cpp
ClemensGruber Feb 21, 2019
344f585
Update README.md
ClemensGruber Feb 21, 2019
ae44558
Delete hani-mandl_v0.0.1.ino
ClemensGruber Feb 25, 2019
972d172
Delete hani-mandl_v0.0.2.ino
ClemensGruber Feb 25, 2019
1c0efd7
Delete hani-mandl_v0.1.0.ino
ClemensGruber Feb 25, 2019
bd3598f
Delete hani-mandl_v0.1.2.ino
ClemensGruber Feb 25, 2019
3888e53
Delete hani-mandl_v0.1.3.ino
ClemensGruber Feb 25, 2019
49ae364
Rename hani-mandl_v0.1.4.ino to hani-mandl.ino
ClemensGruber Feb 25, 2019
f6cea6f
Create historic_copy-fb-group_imkerei-technik-eigenbau
ClemensGruber Feb 25, 2019
0fbd185
Delete historic_copy-fb-group_imkerei-technik-eigenbau
ClemensGruber Feb 25, 2019
be5b059
Create test.txt
ClemensGruber Feb 25, 2019
2604c90
Add files via upload
ClemensGruber Feb 25, 2019
0484890
Delete test.txt
ClemensGruber Feb 25, 2019
e9b2bbb
Delete hani-mandl-wiring_corresponding-to-code-v0.1.3_v0.1.fzz
ClemensGruber Feb 25, 2019
823a8a0
Delete hani-mandl-wiring_corresponding-to-code-v0.1.4_v0.2.0.fzz
ClemensGruber Feb 25, 2019
d9ec6e6
Delete hani-mandl-wiring_corresponding-to-code-v0.1.4_v0.2.1.fzz
ClemensGruber Feb 25, 2019
0d84cb9
Delete hani-mandl-wiring_corresponding-to-code-v0.1.4_v0.2.1.png
ClemensGruber Feb 25, 2019
fc04c7b
Delete hani-mandl.ino
ClemensGruber Feb 25, 2019
f263b2f
Add files via upload
ClemensGruber Feb 25, 2019
7b0003c
Create test.txt
ClemensGruber Feb 25, 2019
912d881
Add files via upload
ClemensGruber Feb 25, 2019
c040e71
Delete test.txt
ClemensGruber Feb 25, 2019
a5a75e5
Add files via upload
ClemensGruber Feb 25, 2019
f0fe4dc
Delete hani-mandl-wiring_corresponding-to-code-v0.1.4_v0.2.0.fzz
ClemensGruber Feb 25, 2019
2b9f850
Delete hani-mandl-wiring_corresponding-to-code-v0.1.3_v0.1.fzz
ClemensGruber Feb 25, 2019
c27704c
Add files via upload
ClemensGruber Feb 25, 2019
0883828
New Heltec pinout, some improvements
ClemensGruber May 9, 2020
163dd00
Common Heltec Wifi Kit 32 Layout
andreash-esp May 18, 2020
7e4e299
Aktualisierte 0.2.0
andreash-esp May 19, 2020
c7076cd
Update hani-mandl.ino
andreash-esp May 20, 2020
1fe0c5f
Winkelberechnung versehentlich verstellt
andreash-esp May 22, 2020
8575de1
Update hani-mandl.ino
andreash-esp Jun 4, 2020
f937ae3
Do not use this code!
andreash-esp Jun 4, 2020
f066340
Bugfixes
andreash-esp Jun 5, 2020
de900a5
Skalierung für Rotary Encoder
andreash-esp Jun 5, 2020
ff37430
Rotary/Poti wahlweise
andreash-esp Jun 7, 2020
e566664
zwei Bugs gefunden
andreash-esp Jun 9, 2020
6d9451a
Readme und Wiring
andreash-esp Jun 10, 2020
2e0e6c5
Ansteuerung Scale
andreash-esp Jun 13, 2020
b8a0cde
Debug aktiv
andreash-esp Jun 13, 2020
2ed0394
Kosmetik
andreash-esp Jun 15, 2020
bf9d7b8
Create hani-mandl-wiring_rotary.fzz
andreash-esp Jun 15, 2020
a02e4c4
Display Bug
andreash-esp Jun 15, 2020
65dd6d4
Code Cleanup
andreash-esp Jun 16, 2020
242bf95
change log / credits ergänzt
ClemensGruber Jun 17, 2020
6bf34bd
fixed typo / new lines
ClemensGruber Jun 17, 2020
0a45ede
Update Hani-Mandl readme.txt
andreash-esp Jun 17, 2020
34cf358
added Hani-Mandl readme.txt to README.md
ClemensGruber Jun 18, 2020
1b15b6e
file rename and adding headers
ClemensGruber Jun 18, 2020
ce98ac9
Delete Hani-Mandl readme.txt
ClemensGruber Jun 18, 2020
9e906fb
Rename hani-mandl-dev.ino to hani-mandl.ino
ClemensGruber Jun 18, 2020
17e35a6
Rename README.md to readme.md
ClemensGruber Jun 18, 2020
ebac352
rename fritzing files
ClemensGruber Jun 18, 2020
862aae1
Create README.md~5f2f0402091dc90d87a7dc7138d9fdbf06649990
ClemensGruber Jun 18, 2020
0de72f0
Create README.md~pr_8
ClemensGruber Jun 18, 2020
ffa1629
delete temporary readme file and merge PlatfrormIO informations to re…
ClemensGruber Jun 18, 2020
fd683d4
merge mismatch fixed
ClemensGruber Jun 19, 2020
94071a6
Merge pull request #10 from ClemensGruber/master
ClemensGruber Jun 19, 2020
a118f17
v0.2.4
andreash-esp Jun 23, 2020
be3a335
Update hani-mandl.ino
andreash-esp Jun 26, 2020
783e7c2
Bugfixes
andreash-esp Jul 2, 2020
9f3c8cf
Kulanz anpassbar
andreash-esp Jul 4, 2020
39cb05c
Setup erweitert
andreash-esp Jul 6, 2020
ffd3424
Update hani-mandl.ino
andreash-esp Jul 24, 2020
4dbc02b
Update hani-mandl.ino
ClemensGruber Aug 13, 2020
a7dd1c1
Update changelog.md
ClemensGruber Aug 13, 2020
b92b543
Update changelog.md
ClemensGruber Aug 13, 2020
2664165
Merge pull request #12 from ClemensGruber/develop
ClemensGruber Aug 13, 2020
494dbaa
Update readme.md
andreash-esp Sep 3, 2020
123aa88
Update readme.md
andreash-esp Sep 15, 2020
135e3b1
Update hani-mandl.ino
andreash-esp Sep 24, 2020
10e9afa
Update hani-mandl.ino
ClemensGruber Nov 17, 2020
21ca82d
Improve build environment and documentation
amotl Jun 15, 2020
bb6476f
Merge pull request #8 from hiveeyes/platformio
ClemensGruber Nov 20, 2020
6b468df
Update hani-mandl.ino
ClemensGruber Nov 20, 2020
29c18d3
:construction: Added more heltec lora
SBajonczak Dec 1, 2020
a84a3a1
:sparkles: Added new HELTEC Pinput wirings
SBajonczak Dec 16, 2020
a100c02
Create readme.md
ClemensGruber Dec 18, 2020
5defb57
added 3d parts from Heilbronner Gartenhonig
ClemensGruber Dec 18, 2020
69bab39
Create readme.md
ClemensGruber Dec 18, 2020
df4f09d
Update readme.md
ClemensGruber Dec 18, 2020
0a405a2
add 3d parst variant Hamburg
ClemensGruber Dec 18, 2020
b28e09f
Update hani-mandl.ino
andreash-esp Dec 28, 2020
4313227
Update readme.md
ClemensGruber Dec 30, 2020
80e69a0
Create hani-mandl.bin
ClemensGruber Dec 30, 2020
81ddc6e
Merge branch 'master' of https://github.com/ClemensGruber/hani-mandl
ClemensGruber Dec 30, 2020
6390cab
Update hani-mandl.ino
ClemensGruber Dec 30, 2020
88b5cdc
Update hani-mandl.ino
ClemensGruber Dec 30, 2020
3f69470
add 3d parts variant Woerth
ClemensGruber Jan 7, 2021
d2b1fa5
Update readme.md
ClemensGruber Jan 7, 2021
b9958f3
Update readme.md
ClemensGruber Jan 7, 2021
c3245d3
Update readme.md
ClemensGruber Jan 7, 2021
ac10602
Add CI using PlatformIO
amotl Jan 8, 2021
fa2eb38
Update platformio.ini
ClemensGruber Jan 8, 2021
f00fdba
Merge pull request #16 from hiveeyes/amo/platformio-ci
ClemensGruber Jan 8, 2021
182b984
Add two badges to README file
amotl Jan 8, 2021
7349ab2
Update library versions
amotl Jan 8, 2021
3c72af8
Merge pull request #17 from hiveeyes/amo/update-libs
ClemensGruber Jan 8, 2021
d0450f0
Merge pull request #19 from hiveeyes/amo/platformio-ci-badge
ClemensGruber Jan 8, 2021
d6e8658
Update hani-mandl.ino
ClemensGruber Jan 8, 2021
684468c
Update hani-mandl.bin
ClemensGruber Jan 8, 2021
adf48e2
:fire: Removed .vscode and updated gitignore
SBajonczak Jan 15, 2021
3c034c5
:twisted_rightwards_arrows: merged remote changes
SBajonczak Jan 15, 2021
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
41 changes: 41 additions & 0 deletions .github/workflows/platformio-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: PlatformIO CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Acquire sources
uses: actions/checkout@v2

- name: Cache pip
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-

- name: Cache PlatformIO
uses: actions/cache@v2
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

- name: Setup Python
uses: actions/setup-python@v2

- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio

- name: Run build
run: pio run
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.pio
.venv*
.vscode
259 changes: 259 additions & 0 deletions .vscode/c_cpp_properties.json

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"platformio.platformio-ide"
]
}
34 changes: 34 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// AUTOMATICALLY GENERATED FILE. PLEASE DO NOT MODIFY IT MANUALLY

// PIO Unified Debugger
//
// Documentation: https://docs.platformio.org/page/plus/debugging.html
// Configuration: https://docs.platformio.org/page/projectconf/section_env_debug.html

{
"version": "0.2.0",
"configurations": [
{
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug",
"executable": "e:/sourcen/hani-mandl/.pio/build/heltec/firmware.elf",
"projectEnvName": "heltec",
"toolchainBinDir": "C:/Users/BajonczakSascha/.platformio/packages/toolchain-xtensa32/bin",
"preLaunchTask": {
"type": "PlatformIO",
"task": "Pre-Debug"
},
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug (skip Pre-Debug)",
"executable": "e:/sourcen/hani-mandl/.pio/build/heltec/firmware.elf",
"projectEnvName": "heltec",
"toolchainBinDir": "C:/Users/BajonczakSascha/.platformio/packages/toolchain-xtensa32/bin",
"internalConsoleOptions": "openOnSessionStart"
}
]
}
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$(eval venvpath := .venv)
$(eval python := $(venvpath)/bin/python)
$(eval pip := $(venvpath)/bin/pip)
$(eval platformio := $(venvpath)/bin/platformio)


build: setup-virtualenv
$(platformio) run

setup-virtualenv:
@test -e $(python) || `command -v virtualenv` --python=python3 $(venvpath)
$(pip) install platformio
9 changes: 0 additions & 9 deletions README.md

This file was deleted.

44 changes: 44 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Change Log
## 2020-08-13, (v0.2.4 bis) v0.2.6

Display:
- Logo und Umlaute implementiert
- Stop-Taste verlässt Setup-Untermenüs
- Anzeige der vorherigen Werte im Setup
- minimaler Servowinkel einstellbar
- Reihenfolge der Boot-Meldungen optimiert

Programmlogik:
- Autokorrektur implementiert
- Kulanzwert für Autokorrektur einstellbar
- Kalibrierung der Waage verbessert


## 2020-06-15, v0.2.3

Hardware:
- Angepasst an Heltec NEW Wifi Kit 32 mit angepasster Beschaltung

Programmcode:
- nicht/wenig benutzte Funktionen und Variablen eliminiert

Display:
- Display-Ausgabe mit sprintf-Formatierung und kleinerem Font
- Play/Pause Symbol zeigt an, ob der Servo aktiv ist
- Boot-Meldung

Programmlogik:
- Servo wird beim Boot und Umschalten zwischen den Modi auf Minimum gefahren
- Umschaltung zwischen den Modi deaktiviert den Servo
- Der Automatik-Modus muss ebenfalls mit der grünen Taste aktiviert werden:
- ohne Autostart kann die Automatik _nur_ aktiviert werden, wenn ein Glas (oder anderes Gewicht!) auf der Waage steht.
Es kann also ein leeres oder teilweise gefülltes Glas bis zum konfigurierten Wert gefüllt werden.
- bei Autostart wird die Automatik mit grün aktiviert und startet, wenn für 1.5 Sekunden ein leeres Glas auf der Waage steht (Anzeige START).
Damit wird verhindert, dass ein schwankendes Gewicht den Vorgang auslöst.
Ändert sich in den 1.5 Sekunden das Gewicht, wird der Vorgang nicht gestartet!
Mit der roten Taste werden beide Automatiken unterbrochen und der Servo auf Minimum gefahren (Not-Aus).
Auch der Autostart wird damit unterbrochen und muss mit grün neu gestartet werden!

Diese Änderungen müssen sich in der Praxis noch bewähren, z.B.:
- wird durch Nachtropfen der Autostart unterbrochen?
- soll ein halbvolles Glas über die Automatik (ohne Autostart) weiter befüllt werden?
Binary file added hani-mandl.bin
Binary file not shown.
Loading