Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy up Ant and implement FE-C #1937

Closed
wants to merge 11 commits into from
Closed

Tidy up Ant and implement FE-C #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5077143
move some of the copy pasted code into a class
stewpend0us Jan 2, 2024
8d75c9d
remove the duplicated code from the ChannelController classes
stewpend0us Jan 2, 2024
4e2c56e
clean up the imports
stewpend0us Jan 2, 2024
de96622
add an isOpen to the base type
stewpend0us Jan 2, 2024
3bdb195
extra } ...
stewpend0us Jan 2, 2024
1024ec7
maybe this will build?
stewpend0us Jan 3, 2024
92b3872
more typos
stewpend0us Jan 4, 2024
6bb344f
can't be static
stewpend0us Jan 4, 2024
aea9776
issue with instantiating an internal class
stewpend0us Jan 4, 2024
017f12f
missing ; and () and forgot to update the constructor signature
stewpend0us Jan 4, 2024
6a5dfd4
typo
stewpend0us Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 181 additions & 0 deletions src/android/src/AntChannelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
/*
* Copyright 2012 Dynastream Innovations Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.cagnulen.qdomyoszwift;

import android.os.RemoteException;

import android.util.Log;

import com.dsi.ant.channel.AntChannel;
import com.dsi.ant.channel.AntCommandFailedException;
import com.dsi.ant.channel.IAntChannelEventHandler;
import com.dsi.ant.message.ChannelId;
import com.dsi.ant.message.ChannelType;
import com.dsi.ant.message.EventCode;
import com.dsi.ant.message.fromant.AcknowledgedDataMessage;
import com.dsi.ant.message.fromant.ChannelEventMessage;
import com.dsi.ant.message.fromant.MessageFromAntType;
import com.dsi.ant.message.ipc.AntMessageParcel;

import java.util.Locale;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.TimeUnit;

// the common bits that are shared between all of the _ChannelController classes
public class AntChannelController {

AntChannel AntChannel;

private int msensor_id;

// The device type and transmission type to be part of the channel ID message
private int mdevice_type;
private int mtransmission_type;

// The period and frequency values
private int mperiod; // 8192 -> 1 Hz
private int mfrequency;

private String mtag;

private IAntChannelEventHandler mChannelEventCallback;
private ChannelType mchannel_type;

private boolean mIsOpen;

public AntChannelController(int sensor_id, int device_type, int transmission_type, int period, int frequency, ChannelType channel_type, String tag) {
msensor_id = sensor_id;
mdevice_type = device_type;
mtransmission_type = transmission_type;
mperiod = period; // 8192 -> 1 Hz
mfrequency = frequency;
mchannel_type = channel_type;
mtag = tag;
}

public void start(AntChannel antChannel, IAntChannelEventHandler callback)
{
AntChannel = antChannel;
mChannelEventCallback = callback;
openChannel();
}

public boolean openChannel() {
if (null != AntChannel) {
if (mIsOpen) {
Log.w(mtag, "Channel was already open");
} else {
// Channel ID message contains device number, type and transmission type. In
// order for master (TX) channels and slave (RX) channels to connect, they
// must have the same channel ID, or wildcard (0) is used.
ChannelId channelId = new ChannelId(msensor_id & 0xFFFF, mdevice_type, mtransmission_type);

try {
// Setting the channel event handler so that we can receive messages from ANT
AntChannel.setChannelEventHandler(mChannelEventCallback);

// Performs channel assignment by assigning the type to the channel. Additional
// features (such as, background scanning and frequency agility) can be enabled
// by passing an ExtendedAssignment object to assign(ChannelType, ExtendedAssignment).
AntChannel.assign(mchannel_type);

/*
* Configures the channel ID, messaging period and rf frequency after assigning,
* then opening the channel.
*
* For any additional ANT features such as proximity search or background scanning, refer to
* the ANT Protocol Doc found at:
* http://www.thisisant.com/resources/ant-message-protocol-and-usage/
*/
AntChannel.setChannelId(channelId);
AntChannel.setPeriod(mperiod);
AntChannel.setRfFrequency(mfrequency);
AntChannel.open();
mIsOpen = true;

Log.d(mtag, "Opened channel with device number: " + msensor_id);

} catch (RemoteException e) {
channelError(e);
} catch (AntCommandFailedException e) {
// This will release, and therefore unassign if required
channelError("Open failed", e);
}
}
} else {
Log.w(mtag, "No channel available");
}

return mIsOpen;
}

public boolean isOpen() {
return mIsOpen;
}

public void channelError(RemoteException e) {
String logString = "Remote service communication failed.";

Log.e(mtag, logString);
}

private void channelError(String error, AntCommandFailedException e) {
StringBuilder logString;

if (e.getResponseMessage() != null) {
String initiatingMessageId = "0x" + Integer.toHexString(
e.getResponseMessage().getInitiatingMessageId());
String rawResponseCode = "0x" + Integer.toHexString(
e.getResponseMessage().getRawResponseCode());

logString = new StringBuilder(error)
.append(". Command ")
.append(initiatingMessageId)
.append(" failed with code ")
.append(rawResponseCode);
} else {
String attemptedMessageId = "0x" + Integer.toHexString(
e.getAttemptedMessageType().getMessageId());
String failureReason = e.getFailureReason().toString();

logString = new StringBuilder(error)
.append(". Command ")
.append(attemptedMessageId)
.append(" failed with reason ")
.append(failureReason);
}

Log.e(mtag, logString.toString());

close();
}

public void close() {
// TODO kill all our resources
if (null != AntChannel) {
mIsOpen = false;

// Releasing the channel to make it available for others.
// After releasing, the AntChannel instance cannot be reused.
AntChannel.release();
AntChannel = null;
}

Log.e(mtag, "Channel Closed");
}

}
14 changes: 10 additions & 4 deletions src/android/src/ChannelService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,20 @@ void clearAllChannels() {

public void openAllChannels() throws ChannelNotAvailableException {
if (Ant.heartRequest)
heartChannelController = new HeartChannelController(acquireChannel());
{
heartChannelController = new HeartChannelController();
heartChannelController.start(acquireChannel(), heartChannelController.new ChannelEventCallback());
}

if (Ant.speedRequest) {
if(Ant.treadmill) {
sdmChannelController = new SDMChannelController(acquireChannel());
sdmChannelController = new SDMChannelController();
sdmChannelController.start(acquireChannel(), sdmChannelController.new ChannelEventCallback());
} else {
powerChannelController = new PowerChannelController(acquireChannel());
speedChannelController = new SpeedChannelController(acquireChannel());
powerChannelController = new PowerChannelController();
powerChannelController.start(acquireChannel(), powerChannelController.new ChannelEventCallback());
speedChannelController = new SpeedChannelController();
speedChannelController.start(acquireChannel(), speedChannelController.new ChannelEventCallback());
}
}
}
Expand Down
127 changes: 11 additions & 116 deletions src/android/src/HeartChannelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,30 @@
* License for the specific language governing permissions and limitations under
* the License.
*/

package org.cagnulen.qdomyoszwift;

import android.os.RemoteException;
import android.util.Log;

import com.dsi.ant.channel.AntChannel;
import com.dsi.ant.channel.AntCommandFailedException;
import com.dsi.ant.channel.IAntChannelEventHandler;
import com.dsi.ant.message.ChannelId;
import com.dsi.ant.message.ChannelType;

import com.dsi.ant.message.EventCode;
import com.dsi.ant.message.fromant.AcknowledgedDataMessage;
import com.dsi.ant.message.fromant.BroadcastDataMessage;
import com.dsi.ant.message.fromant.ChannelEventMessage;
import com.dsi.ant.message.fromant.MessageFromAntType;
import com.dsi.ant.message.ipc.AntMessageParcel;

import java.util.Random;

public class HeartChannelController {



public class HeartChannelController extends AntChannelController{
public static final int HEART_SENSOR_ID = 0;

// The device type and transmission type to be part of the channel ID message
private static final int CHANNEL_HEART_DEVICE_TYPE = 0x78;
private static final int CHANNEL_HEART_TRANSMISSION_TYPE = 1;
Expand All @@ -43,121 +47,12 @@ public class HeartChannelController {

private static final String TAG = HeartChannelController.class.getSimpleName();

private static Random randGen = new Random();

private AntChannel mAntChannel;
private final IAntChannelEventHandler CALLBACK = new ChannelEventCallback();

private ChannelEventCallback mChannelEventCallback = new ChannelEventCallback();


private boolean mIsOpen;
int heart = 0;

public HeartChannelController(AntChannel antChannel) {
mAntChannel = antChannel;
openChannel();
}

boolean openChannel() {
if (null != mAntChannel) {
if (mIsOpen) {
Log.w(TAG, "Channel was already open");
} else {
// Channel ID message contains device number, type and transmission type. In
// order for master (TX) channels and slave (RX) channels to connect, they
// must have the same channel ID, or wildcard (0) is used.
ChannelId channelId = new ChannelId(0,
CHANNEL_HEART_DEVICE_TYPE, CHANNEL_HEART_TRANSMISSION_TYPE);

try {
// Setting the channel event handler so that we can receive messages from ANT
mAntChannel.setChannelEventHandler(mChannelEventCallback);

// Performs channel assignment by assigning the type to the channel. Additional
// features (such as, background scanning and frequency agility) can be enabled
// by passing an ExtendedAssignment object to assign(ChannelType, ExtendedAssignment).
mAntChannel.assign(ChannelType.SLAVE_RECEIVE_ONLY);

/*
* Configures the channel ID, messaging period and rf frequency after assigning,
* then opening the channel.
*
* For any additional ANT features such as proximity search or background scanning, refer to
* the ANT Protocol Doc found at:
* http://www.thisisant.com/resources/ant-message-protocol-and-usage/
*/
mAntChannel.setChannelId(channelId);
mAntChannel.setPeriod(CHANNEL_HEART_PERIOD);
mAntChannel.setRfFrequency(CHANNEL_HEART_FREQUENCY);
mAntChannel.open();
mIsOpen = true;

Log.d(TAG, "Opened channel with device number");
} catch (RemoteException e) {
channelError(e);
} catch (AntCommandFailedException e) {
// This will release, and therefore unassign if required
channelError("Open failed", e);
}
}
} else {
Log.w(TAG, "No channel available");
}

return mIsOpen;
}

void channelError(RemoteException e) {
String logString = "Remote service communication failed.";

Log.e(TAG, logString);
}

void channelError(String error, AntCommandFailedException e) {
StringBuilder logString;

if (e.getResponseMessage() != null) {
String initiatingMessageId = "0x" + Integer.toHexString(
e.getResponseMessage().getInitiatingMessageId());
String rawResponseCode = "0x" + Integer.toHexString(
e.getResponseMessage().getRawResponseCode());

logString = new StringBuilder(error)
.append(". Command ")
.append(initiatingMessageId)
.append(" failed with code ")
.append(rawResponseCode);
} else {
String attemptedMessageId = "0x" + Integer.toHexString(
e.getAttemptedMessageType().getMessageId());
String failureReason = e.getFailureReason().toString();

logString = new StringBuilder(error)
.append(". Command ")
.append(attemptedMessageId)
.append(" failed with reason ")
.append(failureReason);
}

Log.e(TAG, logString.toString());

mAntChannel.release();

Log.e(TAG, "ANT Command Failed");
}

public void close() {
// TODO kill all our resources
if (null != mAntChannel) {
mIsOpen = false;

// Releasing the channel to make it available for others.
// After releasing, the AntChannel instance cannot be reused.
mAntChannel.release();
mAntChannel = null;
}

Log.e(TAG, "Channel Closed");
public HeartChannelController() {
super(HEART_SENSOR_ID, CHANNEL_HEART_DEVICE_TYPE, CHANNEL_HEART_TRANSMISSION_TYPE, CHANNEL_HEART_PERIOD, CHANNEL_HEART_FREQUENCY, ChannelType.SLAVE_RECEIVE_ONLY, TAG);
}

/**
Expand Down
Loading
Loading