From d8800c315038c4af0c348cadc88bddaacf11f027 Mon Sep 17 00:00:00 2001 From: Armin Date: Thu, 16 Feb 2023 23:23:43 +0100 Subject: [PATCH] Bumped version to 3.3 --- .github/workflows/TestCompile.yml | 16 ++++++++-------- README.md | 27 +++++++++++++++++++++------ SimpleDSO.h | 5 ++++- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.github/workflows/TestCompile.yml b/.github/workflows/TestCompile.yml index 5cc9501..797b192 100644 --- a/.github/workflows/TestCompile.yml +++ b/.github/workflows/TestCompile.yml @@ -16,16 +16,16 @@ jobs: - name: Checkout uses: actions/checkout@master - - name: Checkout new BlueDisplay library - uses: actions/checkout@v3 - with: - repository: ArminJo/Arduino-BlueDisplay - ref: master - path: CustomLibrary_BD # must contain string "Custom" - # Must remove BlueDisplay from REQUIRED_LIBRARIES +# - name: Checkout new BlueDisplay library +# uses: actions/checkout@master +# with: +# repository: ArminJo/Arduino-BlueDisplay +# ref: master +# path: CustomLibrary_BD # must contain string "Custom" +# # Must remove BlueDisplay from REQUIRED_LIBRARIES - name: Compile all examples uses: ArminJo/arduino-test-compile@master with: sketch-names: SimpleDSO.ino -# required-libraries: BlueDisplay + required-libraries: BlueDisplay diff --git a/README.md b/README.md index 5f9bcee..7f4c531 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,24 @@ -# [Arduino-Simple-DSO](https://github.com/ArminJo/Arduino-Simple-DSO) -### [Version 3.2](https://github.com/ArminJo/Arduino-Simple-DSO/releases) -[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) -[![Build Status](https://github.com/ArminJo/Arduino-Simple-DSO/workflows/TestCompile/badge.svg)](https://github.com/ArminJo/Arduino-Simple-DSO/actions) -![Hit Counter](https://visitor-badge.laobi.icu/badge?page_id=ArminJo_Arduino-Arduino-Simple-DSO) +
-## SUMMARY +# [Arduino-Simple-DSO](https://github.com/ArminJo/Arduino-Simple-DSO) This DSO needs only a standard Arduino-Uno or Arduino-Nano, a HC-05 Bluetooth module or a micro USB OTG cable / adapter, a few resistors and capacitators and this software. +[![Badge License: GPLv3](https://img.shields.io/badge/License-GPLv3-brightgreen.svg)](https://www.gnu.org/licenses/gpl-3.0) +     +[![Badge Version](https://img.shields.io/github/v/release/ArminJo/Arduino-Simple-DSO?include_prereleases&color=yellow&logo=DocuSign&logoColor=white)](https://github.com/ArminJo/Arduino-Simple-DSO/releases/latest) +     +[![Badge Commits since latest](https://img.shields.io/github/commits-since/ArminJo/Arduino-Simple-DSO/latest?color=yellow)](https://github.com/ArminJo/Arduino-Simple-DSO/commits/master) +     +[![Badge Build Status](https://github.com/ArminJo/Arduino-Simple-DSO/workflows/LibraryBuild/badge.svg)](https://github.com/ArminJo/Arduino-Simple-DSO/actions) +     +![Badge Hit Counter](https://visitor-badge.laobi.icu/badge?page_id=ArminJo_Arduino-Simple-DSO) +
+ +
+ +
+ + | Simple DSO with no attenuator on breadboard | DSO Chart screen | | :-: | :-: | | ![DSO with passive attenuator on breadboard](https://github.com/ArminJo/Arduino-Simple-DSO/blob/master/pictures/ArduinoDSO_simple.jpg) | ![DSO chart screen](https://github.com/ArminJo/Arduino-Simple-DSO/blob/master/pictures/Chart.jpg) | @@ -184,6 +196,9 @@ The captured signal was generated with a STM32F303 DAC and the DSO input range w | ![DSO with passive attenuator on breadboard](https://github.com/ArminJo/Arduino-Simple-DSO/blob/master/pictures/ArduinoDSO_simple.jpg) | ![DSO with passive attenuator on breadboard](https://github.com/ArminJo/Arduino-Simple-DSO/blob/master/pictures/ArduinoDSO.jpg) | # Revision History +### Version 3.3 - 02/2023 +- Compatible to new BlueDisplay library version. + ### Version 3.2 - 11/2019 - Clear data buffer at start and at switching inputs. - Multiline button caption. diff --git a/SimpleDSO.h b/SimpleDSO.h index 4fa1e63..29f6dc0 100644 --- a/SimpleDSO.h +++ b/SimpleDSO.h @@ -26,8 +26,11 @@ #include "TouchDSOCommon.h" // Internal version -#define VERSION_DSO "3.2" +#define VERSION_DSO "3.3" /* + * Version 3.3 - 02/2023 + * - Compatible to new BlueDisplay library version. + * * Version 3.2 - 11/2019 * - Clear data buffer at start and at switching inputs. * - Multiline button caption.