New profile Shifting/Shifter. Initial checkin. #13

Sepp62 · 2019-06-13T21:54:00Z

Dont't know, if you really want to merge this code in such an early state. For my purpose, it is sufficient, I do not plan to make it more sophisticated (except bug fixing).

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

Looking good, excellent first start. Let's add the Travis CI change, that way we can get a compile test done. As long as it compiles and doesn't contain debug code and is correct then I have no problem doing incremental merges 😃

examples/Shifting/Shifting.ino

src/Profiles/Shifting/Shifter/ANTPLUS_ProfileShiftingShifter.cpp

src/Profiles/Shifting/Shifter/ANTPLUS_ProfileShiftingShifter.h

src/Profiles/Shifting/Shifter/ANTPLUS_ProfileShiftingShifter.cpp

src/Profiles/Shifting/ANTPLUS_ShiftingPrivateDefines.h

src/Profiles/Shifting/DataPages/Base/ANTPLUS_ShiftingBaseMainDataPageMsg.h

src/Profiles/Shifting/ANTPLUS_ShiftingProfile.h

src/Profiles/Shifting/ANTPLUS_ShiftingPrivateDefines.h

cujomalainey · 2019-06-14T05:28:02Z

Oh also can you amend that commit so it mentions what it is changing so when people look through the git log they know what the change is without looking at the diff?

src/Profiles/Shifting/ANTPLUS_ShiftingPrivateDefines.h

cujomalainey · 2019-06-15T05:13:15Z

Looks like you only changed the pull request, not the commit, no worries, I can change it after its submitted, we may have to deal with some merge conflicts after. Its not the easiest thing to change, if you think you are up for it you can read up on here otherwise I will fix it up after the PR lands :)

cujomalainey

Bit math looks good, only a few changes left then this will be ready for merge :)

examples/Shifting/Shifting.ino

src/Profiles/Shifting/DataPages/Base/ANTPLUS_ShiftingBaseMainDataPageMsg.h

src/Profiles/Shifting/Shifter/ANTPLUS_ProfileShiftingShifter.cpp

src/Profiles/Shifting/DataPages/Base/ANTPLUS_ShiftingBaseMainDataPageMsg.cpp

src/Profiles/Shifting/Shifter/ANTPLUS_ProfileShiftingShifter.cpp

cujomalainey · 2019-06-18T05:53:35Z

also bit math looks good 👍

Add datapage 81 to the mix

Add datapage 80 for TX

cujomalainey · 2019-06-20T06:30:49Z

You can fetch and merge the branch core/base-master and you will get the ProductInformationMsg and ManufacturersInformationMsg which you can use to replace the temp data buffers.

cujomalainey

Looking good but it looks like you merged your copy of develop which had both lev and moxy in the branch, I want to keep them isolated still till I have time to fully flesh out the profile. If its easier for you I can merge this, rebase the commits so the proper merge happens and then force push the branch, then you will just have to force sync on your end. Up to you :) Otherwise the shifting stuff looks great :)

cujomalainey · 2019-06-22T06:57:17Z

.gitignore

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


Accidental add?

Yes, this was accidentally. Sorry.

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

examples/BikeSensorConverter/BikeSensorConverter.ino

@@ -0,0 +1,352 @@
+/**********************************************


Not sure if you meant to commit your project to the examples. If you want to commit this to the repo we should do it not on the shifting branch since it uses multiple profiles :) The project is looking good, you will have to tell me more about what it does.

This happened by mistake. Can you remove it from the pull request ? We can talk about adding it to the examples, when it is thoroughly tested.

cujomalainey · 2019-06-22T07:06:34Z

examples/BikeSensorConverter/arduino_secrets.h

@@ -0,0 +1 @@
+#define SECRET_ANTNETWORK_KEY {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}


Accidental commit?

Yes, accidental.

cujomalainey · 2019-06-22T07:08:04Z

examples/LEVDisplay/LEVDisplay.ino

@@ -0,0 +1,206 @@
+/**********************************************


There was no merge from the LEV branch so I am not sure how this got in here.

Pooh. Seems I need to work at my understanding for github...

cujomalainey · 2019-06-22T07:09:27Z

examples/MuscleOxygenMonitor/MuscleOxygenMonitor.ino

@@ -0,0 +1,60 @@
+/**********************************************


there was no merge from the MOxy branch, accidental merge into develop?

Yes, accidental. See above.

cujomalainey · 2019-06-22T07:11:56Z

examples/Shifting/Shifting.ino

+ // setup shifting monitor
+ shift.createShiftingSystemStatusMsg(shiftCreateMsgHandler);
+ shift.createShiftingManufacturerInformationMsg(shiftCreateManufacturerInformationMsg);
+ shift.createShiftingProductInformationMsg(shiftCreateProductInformationMsg);


Looking good, I forgot to implement batterystatus which needs a TODO here :)

Sepp62 · 2019-06-22T08:21:40Z

Looking good but it looks like you merged your copy of develop which had both lev and moxy in the branch, I want to keep them isolated still till I have time to fully flesh out the profile. If its easier for you I can merge this, rebase the commits so the proper merge happens and then force push the branch, then you will just have to force sync on your end. Up to you :) Otherwise the shifting stuff looks great :)

Yes, would be great, if you could properly merge to the profile branches and throw the unwanted sources out. Thank. Next time, I will try to be more thorough.

cujomalainey · 2019-06-22T16:02:54Z

Ok sounds good, I'll merge this, then force push a rebased version. Your local copy will likely complain that you are out of sync and try and merge your local branch into my new branch, you don't want to do that since it will add all the bugs back. You will want to delete your local shifting branch and re-create it on top of my branch once I have pushed it. I will send you an email once that is done.

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, not yet tested

878143e

cujomalainey self-assigned this Jun 14, 2019

cujomalainey requested changes Jun 14, 2019

View reviewed changes

cujomalainey reviewed Jun 14, 2019

View reviewed changes

src/Profiles/Shifting/ANTPLUS_ShiftingPrivateDefines.h Outdated Show resolved Hide resolved

Sepp62 changed the title ~~First shot, not yet fully tested~~ New profile Shifting/Shifter. Initial checkin. Jun 14, 2019

Some correction after code review

dd07c89

Sepp62 and others added 4 commits June 15, 2019 19:26

ShiftingBaseGenericMsg() base class removed

7107fe6

_eventCount bug removed

9015aa4

Rev minor version

6d3c6dd

Typo

54a2ffa

cujomalainey and others added 4 commits June 16, 2019 19:42

Typo

7b78805

Created

225398d

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

355c3b0

Tabs replaced w/ spaces

26f5aae

cujomalainey requested changes Jun 18, 2019

View reviewed changes

cujomalainey added 3 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

Sepp62 added 8 commits June 21, 2019 10:10

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/shifting/shifter

f7b5541

Refactoring manufacturer and product information

838707b

Some minor adaptions due to pull request conversation

90ff578

Merge branch 'Development' into profiles/shifting/shifter

9dae63c

cujomalainey reviewed Jun 22, 2019

View reviewed changes

cujomalainey merged commit 2a8b69e into cujomalainey:profiles/shifting/shifter Jun 22, 2019

		@@ -0,0 +1,352 @@
		/**********************************************

		@@ -0,0 +1 @@
		#define SECRET_ANTNETWORK_KEY {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}

		@@ -0,0 +1,206 @@
		/**********************************************

		@@ -0,0 +1,60 @@
		/**********************************************

Uh oh!

New profile Shifting/Shifter. Initial checkin. #13

New profile Shifting/Shifter. Initial checkin. #13

Uh oh!

Conversation

Sepp62 commented Jun 13, 2019

cujomalainey left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cujomalainey commented Jun 14, 2019

Uh oh!

cujomalainey commented Jun 15, 2019

cujomalainey left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cujomalainey commented Jun 18, 2019

cujomalainey commented Jun 20, 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

Sepp62 commented Jun 22, 2019

cujomalainey commented Jun 22, 2019

Labels

2 participants