Skip to content

Commit

Permalink
0.9.11
Browse files Browse the repository at this point in the history
## [0.9.11] - 2025-01-31

### Changed

- fix Arduino and pico Pi issues better then in 0.9.10
  • Loading branch information
Zeppelin500 committed Jan 31, 2025
1 parent 463cf31 commit 75863e6
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [0.9.11] - 2025-01-31

### Changed

- fix Arduino and pico Pi issues better then in 0.9.10

## [0.9.10] - 2025-01-29

### Changed
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MBusinoLib - an Arduino M-Bus Decoder Library

[![version](https://img.shields.io/badge/version-0.9.10-brightgreen.svg)](CHANGELOG.md)
[![version](https://img.shields.io/badge/version-0.9.11-brightgreen.svg)](CHANGELOG.md)
[![license](https://img.shields.io/badge/license-GPL--3.0-orange.svg)](LICENSE)


Expand All @@ -10,7 +10,7 @@ The **MBusinoLib** library enables Arduino devices to decode M-Bus (Meterbus) RS

Most M-Bus devices should be supported.

Tested at ESPs, Arduino MKR and Uno R4.
Tested at ESPs, Arduino MKR, pico pi and Uno R4. 8 Bit Arduinos do not work because of missing float64 support.

Live test of the [**MBusinoLib Example**](https://wokwi.com/projects/402235052803622913) at wokwi.com

Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "git",
"url": "https://github.com/Zeppelin500/MBusinoLib.git"
},
"version": "0.9.10",
"version": "0.9.11",
"license": "GPL-3.0",
"frameworks": "arduino",
"platforms": ["atmelavr", "atmelsam", "espressif8266"],
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=MBusinoLib
version=0.9.10
version=0.9.11
author=Zeppelin500 <[email protected]>
maintainer=Zeppelin500 <[email protected]>
sentence=an Arduino M-Bus decoder Library
Expand Down
9 changes: 3 additions & 6 deletions src/MBusinoLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ uint8_t MBusinoLib::decode(uint8_t *buffer, uint8_t size, JsonArray& root) {


// Get VIF(E)
uint64_t vif = 0;
uint32_t vif = 0;
uint8_t vifarray[10] = {0};
uint8_t vifcounter = 0;

Expand Down Expand Up @@ -584,10 +584,7 @@ uint8_t MBusinoLib::decode(uint8_t *buffer, uint8_t size, JsonArray& root) {

// Init object
JsonObject data = root.add<JsonObject>();
// data["vif"] = String("0x" + String(vif,HEX));
char vifBuffer[10] = {0};
ltoa (vif,vifBuffer,HEX);
data["vif"] = String("0x" + String(vifBuffer));
data["vif"] = String("0x" + String(vif,HEX));
data["code"] = vif_defs[def].code;
//data["vifarray1"] = String("0x" + String(vifarray[1],HEX));
//data["vifarray2"] = String("0x" + String(vifarray[2],HEX));
Expand Down Expand Up @@ -1439,7 +1436,7 @@ const char * MBusinoLib::getStateClass(uint8_t code) {

// ----------------------------------------------------------------------------

int16_t MBusinoLib::_findDefinition(uint64_t vif) {
int16_t MBusinoLib::_findDefinition(uint32_t vif) {

for (uint8_t i=0; i<MBUS_VIF_DEF_NUM; i++) {
vif_def_type vif_def = vif_defs[i];
Expand Down
6 changes: 3 additions & 3 deletions src/MBusinoLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ enum MBUS_ERROR {

typedef struct {
uint8_t code;
uint64_t base;
uint32_t base;
uint8_t size;
int8_t scalar;
} vif_def_type;
Expand Down Expand Up @@ -380,7 +380,7 @@ class MBusinoLib {

protected:

int16_t _findDefinition(uint64_t vif);
int16_t _findDefinition(uint32_t vif);
uint32_t _getVIF(uint8_t code, int8_t scalar);

uint8_t * _buffer;
Expand All @@ -389,4 +389,4 @@ class MBusinoLib {
uint8_t _error = NO_ERROR;

};
#endif
#endif

0 comments on commit 75863e6

Please sign in to comment.