Initial MOxy sensor code #15

cujomalainey · 2019-06-14T01:29:16Z

No description provided.

Repo uses 4 space indentation, even in 2019 indentation conversion is still hard :P thank you sublime text for saving us.

This will unpack the data and build it into the API so profiles can handle the patterns easier.

This should fix up everything.

Add to build so its compile tested all the time

Convert all tabs to spaces

Decoding not yet completly tested (TODOS added)

Gotta have a driver to reset the hardware.

cujomalainey

Apparently I can't request changes to myself since I authored this PR @Sepp62, but here are my comments. I am going to revamp my testing infra this next week (right now I have to book my main desktop into windows just to run Simulant+ when i prefer coding in linux) so I am going to try setting up a raspberry pi with windows so I can test easier.

cujomalainey · 2019-06-14T05:29:05Z

examples/MuscleOxygenMonitor/MuscleOxygenMonitor.ino

+#include "ANTPLUS.h"
+
+#define BAUD_RATE 9600
+#define CHANNEL_1 0


CHANNEL_1 but defined as 0?

cujomalainey · 2019-06-14T05:31:09Z

src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h

+#define ANTPLUS_MUSCLEOXYGENPROFILEPRIVATEDEFINES_h
+
+/* Channel Config */
+#define ANTPLUS_MUSCLEOXYGEN_CHANNELTYPE CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE 


ANTPLUS_MUSCLEOXYGEN_DISPLAY_CHANNELTYPE

cujomalainey · 2019-06-14T05:31:58Z

src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h

+#define ANTPLUS_MUSCLEOXYGEN_DEVICETYPE 31
+#define ANTPLUS_MUSCLEOXYGEN_CHANNELPERIOD 8192
+// Master channel
+#define ANTPLUS_MUSCLEOXYGEN_MASTER_CHANNELTYPE 0x10 


#define ANTPLUS_MUSCLEOXYGEN_MONITOR_CHANNELTYPE CHANNEL_TYPE_BIDIRECTIONAL_TRANSMIT

cujomalainey · 2019-06-14T05:32:39Z

src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h

+// Master channel
+#define ANTPLUS_MUSCLEOXYGEN_MASTER_CHANNELTYPE 0x10 
+#define ANTPLUS_MUSCLEOXYGEN_MASTER_TRANSMISSIONTYPE 5
+#define ANTPLUS_MUSCLEOXYGEN_MASTER_DEVICENUMBER 5


What is this for?

cujomalainey · 2019-06-14T05:37:14Z

src/Profiles/MuscleOxygen/ANTPLUS_MuscleOxygenPrivateDefines.h

+#define ANTPLUS_MUSCLEOXYGEN_SEARCHTIMEOUT 12
+
+/* Pages */
+#define ANTPLUS_MUSCLEOXYGEN_DATAPAGE_MUSCLEOXYGENDATA 1


add _NUMBER

cujomalainey · 2019-06-14T05:49:03Z

src/Profiles/MuscleOxygen/DataPages/Base/ANTPLUS_MuscleOxygenBaseMainDataPageMsg.cpp

+MuscleOxygenBaseMainDataPageMsg::MuscleOxygenBaseMainDataPageMsg(uint8_t dataPageNumber) : MuscleOxygenBaseGenericMsg()
+{
+ _buffer[ANTPLUS_DEFAULT_DATAPAGE_BYTE] = dataPageNumber;
+ setCapabilities();


See comment on other review about automating API :)

dataPageNumber parameter removed.

cujomalainey · 2019-06-14T05:53:49Z

src/Profiles/MuscleOxygen/DataPages/Base/ANTPLUS_MuscleOxygenBaseMainDataPageMsg.h

+ void setTotalHemoglobinConcentration( uint16_t tc );
+ void setCurrentSaturatedHemoglobinPercentage(uint16_t cp);
+
+ // internal


Why are these internal? Don't we want users to set these values?

"internal" removed

cujomalainey · 2019-06-14T05:55:26Z

src/Profiles/MuscleOxygen/Monitor/ANTPLUS_ProfileMuscleOxygenMonitor.cpp

+}
+
+void ProfileMuscleOxygenMonitor::transmitNextDataPage() {
+ // some static aux messages


I'm out of town (and off grid) in the mountains, but next week I'll do my best to fill in these missing common datapages on core/base-master and merge it into the shifter and moxy branches for you.

cujomalainey · 2019-06-14T05:56:08Z

src/Profiles/MuscleOxygen/Monitor/ANTPLUS_ProfileMuscleOxygenMonitor.cpp

+ _patternStep = 0;
+
+ // debug
+ /*


Debug needs to be removed :)

cujomalainey · 2019-06-14T05:57:55Z

src/Profiles/MuscleOxygen/Monitor/ANTPLUS_ProfileMuscleOxygenMonitor.cpp

+
+void ProfileMuscleOxygenMonitor::transmitMuscleOxygenMainPageMsg() {
+ MuscleOxygenBaseMainDataPageMsg msg;
+ msg.setEventCount( _eventCount );


I don't think we can control this, if I'm reading the datasheet right, it should only increment when the sensor gets a new value, which is outside the libraries' control and depends on the moxy hardware.

cujomalainey · 2019-06-14T06:04:18Z

Oh also i forgot, both PRs I didn't check the bit math yet for the messages, not quite awake enough for that, will check that next version.

cujomalainey

Definitely very close to being ready to merge 👍 bit math looks good

cujomalainey · 2019-06-18T05:51:50Z

src/Profiles/MuscleOxygen/DataPages/Base/ANTPLUS_MuscleOxygenBaseMainDataPageMsg.h

+ void setNotifications(uint8_t n = 0x00);
+ void setCapabilities(uint8_t c = 0x06);
+ void setEventCount(uint8_t n);
+ uint8_t * getBuffer() { return _buffer; }


Implemented by AntTxDataRequest :)

cujomalainey · 2019-06-18T05:57:37Z

src/Profiles/MuscleOxygen/DataPages/Base/ANTPLUS_MuscleOxygenBaseMainDataPageMsg.cpp

+ _buffer[5] |= (tc >> 8) & 0x0F;
+}
+
+/* TODO


Looks good, what is missing here that needs the TODO?

The behaviour of "setPreviousSaturatedHemoglobinPercentage" cannot be verified with my moxy display device. So it is not clear for me, how to handle it from the application side. Of course, I read the antplus docs, but I do not have a clue about the use of it. Since I cannot test it, I commented it out to give somebody else a chance to use it.

I think the device just bumps the reading down. So on every event it moves the current value into previous and puts a new current. Docs site this reasoning for in the event of a data loss. It would be awesome if the class could handle this itself but since the class is never preserver I don't think there is a way around it other than showing the user through the example to do it themselves.

src/Profiles/MuscleOxygen/DataPages/Base/ANTPLUS_MuscleOxygenBaseMainDataPageMsg.h

Add datapage 81 to the mix

Add datapage 80 for TX

cujomalainey

Few minor comments I can deal with, although there is the issue of the merge, but same comment applies as in the other PR, I can rebase and force push if you want :) just let me know.

cujomalainey · 2019-06-22T07:24:02Z

examples/MuscleOxygenMonitor/MuscleOxygenMonitor.ino

+ msg.setTotalHemoglobinConcentration(_c);
+ msg.setCurrentSaturatedHemoglobinPercentage(_c++/4);
+ msg.setEventCount(_eventCount++);
+


TODO to add "previous sat hemoglobin"

This function is a mystery to me and my moxy display. Somebody else should integrate it.

cujomalainey · 2019-06-22T07:24:35Z

.gitignore

 .DS_Store
 .tags*
 tags
+examples/BikeSensorConverter/arduino_secrets.h


looks like the same merge happened here as well.

cujomalainey · 2019-06-22T07:32:50Z

src/Profiles/MuscleOxygen/DataPages/Base/ANTPLUS_MuscleOxygenBaseMainDataPageMsg.cpp

+
+MuscleOxygenBaseMainDataPageMsg::MuscleOxygenBaseMainDataPageMsg(uint8_t dataPageNumber) : BaseDataPageMsg<BroadcastDataMsg>()
+{
+ memset(_buffer, 0, MESSAGE_SIZE);


Just curious what the benefit of memsetting the values are :) All values in the datapage should be defined so we shouldnt be left with an 0s.

During development, you cannot be sure to have all the bytes in a defined state. Initializing with "0" makes it easier to see bugs in bit math. Generally spoken: Initializing member data has very low cost and pays off during develplement and maintenance life cycle. In our special case "moxy" setPreviousSaturatedHemoglobinPercentage is unused and therefore a default initialization is helpful.

Fair point, I think though I would just set it to 0 it out in the variable declaration.

*edit fair

cujomalainey · 2019-06-22T22:28:53Z

Going to merge, rebase then force push. The merge will disappear as in shifting but commits will be preserved.

cujomalainey and others added 19 commits February 4, 2018 21:26

Merge branch 'develop'

d44c8e2

Rev minor version

98d5cff

Typo

9b000e8

Typo

68e0b7b

LEV profile for display and example added

b051972

Refactoring Part 1

d38ecb3

Convert all tabs to spaces

81c9431

Repo uses 4 space indentation, even in 2019 indentation conversion is still hard :P thank you sublime text for saving us.

BaseMaster: Handle request datapages in the base profile

f841494

This will unpack the data and build it into the API so profiles can handle the patterns easier.

Travis: Missed a couple arguements in base master

91cb627

This should fix up everything.

LEV: Display: Add example to Travis config

50e7ce8

Add to build so its compile tested all the time

Merge pull request #1 from cujomalainey/temp/remote/pr

128d11c

Convert all tabs to spaces

rename LEV folder to Lev

d8b830c

getError() --> getErrorMessage()

6fd66e2

Unnecessary comment removed

6395970

Some corrections, mainly TODOs added and some decoding bug fixes

b9582be

Decoding not yet completly tested (TODOS added)

.gitignore rolled back

b294cad

Router: Reset radio before clearing reference

59a5074

Gotta have a driver to reset the hardware.

Constant changed and commented code removed

36e4357

First shot of muscle oxygen monitor profile, rudimentarily tested

8897dd8

cujomalainey self-assigned this Jun 14, 2019

cujomalainey mentioned this pull request Jun 14, 2019

First shot for /moxy/monitor profile #14

Closed

cujomalainey commented Jun 14, 2019

View reviewed changes

Sepp62 and others added 7 commits June 15, 2019 20:30

Refactoring consistent to "shifter"

b093d80

isDataPageValid() changed

fd43f0d

Rev minor version

6d3c6dd

Typo

54a2ffa

Typo

7b78805

Created

225398d

Demo key for ANT network. Use your own from thisisant.com

355c3b0

Tabs replaced w/ spaces

26f5aae

cujomalainey commented Jun 18, 2019

View reviewed changes

cujomalainey and others added 9 commits June 19, 2019 23:23

CommonDataPages: Add ProductInformationMsg

f3d15fb

Add datapage 81 to the mix

CommonDataPages: Add ManufacturersInfomation

1cb487b

Add datapage 80 for TX

Merge branch 'develop' into core/base-master

d3c5962

Merge branch 'master' into Development

dfdd074

Merge branch 'core/base-master' into Development

6fca841

Adapted to new msg balse classes for manufacturer and product

919362b

Refactoring Moxy and Shifting for product and manufacturer information

ad3ba44

Merge branch 'Development' into profiles/moxy/monitor

6d091c5

Refactoring manufacturer and product information

bc5f297

cujomalainey commented Jun 22, 2019

View reviewed changes

cujomalainey merged commit 7b2912c into cujomalainey:profiles/moxy/monitor Jun 22, 2019

Uh oh!

Initial MOxy sensor code #15

Initial MOxy sensor code #15

Uh oh!

Conversation

cujomalainey commented Jun 14, 2019

cujomalainey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cujomalainey commented Jun 14, 2019

cujomalainey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sepp62 Jun 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

cujomalainey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sepp62 Jun 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

cujomalainey Jun 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

cujomalainey commented Jun 22, 2019

Labels

2 participants

Sepp62 Jun 22, 2019 •

edited

Loading

Sepp62 Jun 22, 2019 •

edited

Loading

cujomalainey Jun 22, 2019 •

edited

Loading