Compare commits
5 commits
0.0.1-draf
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| a1aa8baf7c | |||
| c055b72348 | |||
| 23991e645e | |||
| dd09848a3d | |||
| dc442c2b93 |
8 changed files with 46 additions and 64 deletions
70
.drone.yml
70
.drone.yml
|
|
@ -6,17 +6,6 @@ volumes:
|
||||||
temp: {}
|
temp: {}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# - name: preview
|
|
||||||
# image: rust:1.50-musl
|
|
||||||
# volumes:
|
|
||||||
# - name: target
|
|
||||||
# path: /drone/src/target
|
|
||||||
# commands:
|
|
||||||
# - env
|
|
||||||
# - pwd
|
|
||||||
# - ls
|
|
||||||
# - ls target
|
|
||||||
|
|
||||||
# - name: build_test
|
# - name: build_test
|
||||||
# image: drone_rust:1.50-musl
|
# image: drone_rust:1.50-musl
|
||||||
# volumes:
|
# volumes:
|
||||||
|
|
@ -51,23 +40,24 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- grep '^version = ' Cargo.toml | cut -f2 -d\" > target/VERSION
|
- grep '^version = ' Cargo.toml | cut -f2 -d\" > target/VERSION
|
||||||
- cat target/VERSION
|
- cat target/VERSION
|
||||||
- cp target/armv7-unknown-linux-musleabihf/release/s0_meter target/s0_meter-armhf-$(cat target/VERSION)
|
- cp target/armv7-unknown-linux-musleabihf/release/s0-meter target/s0-meter_$(cat target/VERSION)_armhf
|
||||||
|
- cp bundle/* target/
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
- name: show_results
|
# - name: show_results
|
||||||
image: alpine
|
# image: alpine
|
||||||
volumes:
|
# volumes:
|
||||||
- name: target
|
# - name: target
|
||||||
path: /drone/src/target
|
# path: /drone/src/target
|
||||||
commands:
|
# commands:
|
||||||
- ls -l target
|
# - ls -l target
|
||||||
- ls -l target/release
|
# - ls -l target/release
|
||||||
- ls -l target/armv7-unknown-linux-musleabihf
|
# - ls -l target/armv7-unknown-linux-musleabihf
|
||||||
- ls -l target/armv7-unknown-linux-musleabihf/release
|
# - ls -l target/armv7-unknown-linux-musleabihf/release
|
||||||
- ls -l target
|
# - ls -l target
|
||||||
when:
|
# when:
|
||||||
event: tag
|
# event: tag
|
||||||
|
|
||||||
- name: deploy
|
- name: deploy
|
||||||
image: plugins/gitea-release
|
image: plugins/gitea-release
|
||||||
|
|
@ -78,28 +68,12 @@ steps:
|
||||||
api_key:
|
api_key:
|
||||||
from_secret: GITEA_TOKEN
|
from_secret: GITEA_TOKEN
|
||||||
base_url: https://gitea.kube-it.de
|
base_url: https://gitea.kube-it.de
|
||||||
files: /drone/src/target/s0_meter-*
|
title: VERSION
|
||||||
|
note: CHANGELOG.md
|
||||||
|
files:
|
||||||
|
- /drone/src/target/s0-meter_*
|
||||||
|
- /drone/src/bundle/*
|
||||||
|
draft: true
|
||||||
|
prerelease: true
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
# kind: pipeline
|
|
||||||
# type: exec
|
|
||||||
# name: toolchain
|
|
||||||
|
|
||||||
# steps:
|
|
||||||
# - name: build
|
|
||||||
# commands:
|
|
||||||
# - pwd
|
|
||||||
# - ls -lh
|
|
||||||
# - docker build -t drone_rust:1.50-musl .
|
|
||||||
|
|
||||||
# ---
|
|
||||||
# kind: pipeline
|
|
||||||
# type: docker
|
|
||||||
# name: s0_meter
|
|
||||||
|
|
||||||
# steps:
|
|
||||||
# - name: checkout
|
|
||||||
# image: drone_rust:1.50-musl
|
|
||||||
# commands:
|
|
||||||
# - cargo build --release --target=armv7-unknown-linux-musleabihf --features="rppal"
|
|
||||||
|
|
|
||||||
10
CHANGELOG.md
Normal file
10
CHANGELOG.md
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
# Changelog
|
||||||
|
All changes to s0-meter will be documented here.
|
||||||
|
|
||||||
|
## 0.0.2
|
||||||
|
Rename the project to "s0-meter".
|
||||||
|
|
||||||
|
## 0.0.0
|
||||||
|
Initial release.
|
||||||
|
### Added
|
||||||
|
Everything. :)
|
||||||
4
Cargo.lock
generated
4
Cargo.lock
generated
|
|
@ -1294,8 +1294,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
|
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "s0_meter"
|
name = "s0-meter"
|
||||||
version = "0.1.0"
|
version = "0.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"clap",
|
"clap",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "s0_meter"
|
name = "s0-meter"
|
||||||
version = "0.0.1"
|
version = "0.0.2"
|
||||||
authors = ["hk"]
|
authors = ["hk"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
|
@ -12,7 +12,6 @@ rppal = { version = "0.11.3", features = ["hal"] }
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = true
|
lto = true
|
||||||
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
rpi_gpio = ["rppal"]
|
rpi_gpio = ["rppal"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
FROM rust:1.50-slim
|
FROM rust:1.50-slim
|
||||||
|
|
||||||
# RUN apk add --no-cache musl-dev binutils-arm-none-eabi
|
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
RUN apt-get -y upgrade
|
RUN apt-get -y upgrade
|
||||||
RUN apt-get -y install binutils-arm-linux-gnueabihf musl-dev
|
RUN apt-get -y install binutils-arm-linux-gnueabihf musl-dev
|
||||||
|
|
@ -8,7 +7,7 @@ RUN apt-get clean
|
||||||
RUN rm -rf /var/lib/apt/lists/*
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
RUN rustup target add armv7-unknown-linux-musleabihf
|
RUN rustup target add armv7-unknown-linux-musleabihf
|
||||||
|
|
||||||
#WORKDIR /usr/src/s0_meter
|
#WORKDIR /usr/src/s0-meter
|
||||||
#COPY . .
|
#COPY . .
|
||||||
|
|
||||||
#RUN cargo test
|
#RUN cargo test
|
||||||
|
|
|
||||||
16
README.md
16
README.md
|
|
@ -1,15 +1,15 @@
|
||||||
# s0_meter - Der Zähler für S0-Impulse an den RPi-GPIOs
|
# s0-meter - Der Zähler für S0-Impulse an den RPi-GPIOs
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
[](https://drone.kube-it.de/hk/s0_meter)
|
[](https://drone.kube-it.de/hk/s0-meter)
|
||||||
|
|
||||||
## Funktion
|
## Funktion
|
||||||
Das Programm s0_meter registriert alle an den configurierten RPi-GPIOs auftretenden Pegeländerungen, speichert diese intern in einer Liste und gibt diese über ein REST-API per HTTP-Request im JSON-Format aus.
|
Das Programm s0-meter registriert alle an den configurierten RPi-GPIOs auftretenden Pegeländerungen, speichert diese intern in einer Liste und gibt diese über ein REST-API per HTTP-Request im JSON-Format aus.
|
||||||
|
|
||||||
Das Programm zeichnet alle registrierten Pegeländerungen auf. Eine eventuell notwendige Entprellung der Pulse muss der Client-Applikation erfolgen.
|
Das Programm zeichnet alle registrierten Pegeländerungen auf. Eine eventuell notwendige Entprellung der Pulse muss der Client-Applikation erfolgen.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
Das Programm s0_meter kann in ein beliebiges Verzeichnis abgelegt werden.
|
Das Programm s0-meter kann in ein beliebiges Verzeichnis abgelegt werden.
|
||||||
|
|
||||||
## Konfiguration
|
## Konfiguration
|
||||||
### GPIOs
|
### GPIOs
|
||||||
|
|
@ -25,17 +25,17 @@ Die Konfiguration der S0-Kanäle und der zugehörigen RPi-GPIOs erfolgt in einer
|
||||||
```
|
```
|
||||||
Für jeden Kanal wird die Kanal-ID und die Nummer des RPi-GPIO angegeben. Die Kanal-IDs sind frei wählbar und müssen nicht fortlaufen sein. Für die RPi-GPIOs muss die Nummer angegeben werden, die am RPi-Pfostenstecker steht.
|
Für jeden Kanal wird die Kanal-ID und die Nummer des RPi-GPIO angegeben. Die Kanal-IDs sind frei wählbar und müssen nicht fortlaufen sein. Für die RPi-GPIOs muss die Nummer angegeben werden, die am RPi-Pfostenstecker steht.
|
||||||
|
|
||||||
Standardmäßig wird die Konfigurationsdatei `/etc/s0_meter.cfg` gelesen. Mit dem Kommandozeilenparameter `-c` kann eine andere Datei angegeben werden.
|
Standardmäßig wird die Konfigurationsdatei `/etc/s0-meter.cfg` gelesen. Mit dem Kommandozeilenparameter `-c` kann eine andere Datei angegeben werden.
|
||||||
## Kommandzeilenargumente
|
## Kommandzeilenargumente
|
||||||
Die möglichen Kommandozeilenargumente können wie folgt ermittelt werden:
|
Die möglichen Kommandozeilenargumente können wie folgt ermittelt werden:
|
||||||
```
|
```
|
||||||
$ ./s0_meter --help
|
$ ./s0-meter --help
|
||||||
s0_meter 0.1.0
|
s0-meter 0.1.0
|
||||||
Harald Kube <harald.kube@gmx.de>
|
Harald Kube <harald.kube@gmx.de>
|
||||||
Listen for S0 pulses at the given GPIO pins
|
Listen for S0 pulses at the given GPIO pins
|
||||||
|
|
||||||
USAGE:
|
USAGE:
|
||||||
s0_meter [OPTIONS]
|
s0-meter [OPTIONS]
|
||||||
|
|
||||||
FLAGS:
|
FLAGS:
|
||||||
-h, --help Prints help information
|
-h, --help Prints help information
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#/bin/bash
|
#/bin/bash
|
||||||
|
|
||||||
WORK_DIR=/usr/src/s0_meter
|
WORK_DIR=/usr/src/s0-meter
|
||||||
RUST_VERSION=1.50
|
RUST_VERSION=1.50
|
||||||
RUST_IMG_FLAVOR=musl
|
RUST_IMG_FLAVOR=musl
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue