Compare commits

...

2 Commits

Author SHA1 Message Date
Denny Sheirer
cd098955aa #2696 Change alias 'group' labeling to 'category' to avoid confusing group to mean talkgroup. (#2703)
Co-authored-by: denny <dennis.sheirer@gmail.com>
2026-11-19 03:45:05 -05:00
Denny Sheirer
61efb3d299 #2698 SIMD component factories explicitly handle UNCALIBRATED calibration state (#2699)
ComplexMixerFactory logged an unrecognized implementation warning when calibration had not been run (e.g. CI) before falling back to the scalar mixer. All SIMD component factories now map UNCALIBRATED to the scalar implementation explicitly.

Co-authored-by: denny <dennis.sheirer@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-19 03:06:50 -05:00
17 changed files with 23 additions and 10 deletions

View File

@@ -42,6 +42,7 @@ public class ChannelDFTFactory
case VECTOR_SIMD_PREFERRED: case VECTOR_SIMD_PREFERRED:
return new VectorChannelDFT(channelCount); return new VectorChannelDFT(channelCount);
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarChannelDFT(channelCount); return new ScalarChannelDFT(channelCount);
} }

View File

@@ -42,6 +42,7 @@ public class DcRemovalFilterFactory
case VECTOR_SIMD_PREFERRED: case VECTOR_SIMD_PREFERRED:
return new VectorDcRemovalFilter(gain); return new VectorDcRemovalFilter(gain);
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarDcRemovalFilter(gain); return new ScalarDcRemovalFilter(gain);
} }

View File

@@ -52,6 +52,7 @@ public class FmDemodulatorFactory
case VECTOR_SIMD_512: case VECTOR_SIMD_512:
return new VectorFMDemodulator512(); return new VectorFMDemodulator512();
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarFMDemodulator(); return new ScalarFMDemodulator();
} }

View File

@@ -44,6 +44,7 @@ public class ComplexGainFactory
return new VectorComplexGainControl(); return new VectorComplexGainControl();
} }
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ComplexGainControl(); return new ComplexGainControl();
} }
@@ -64,6 +65,7 @@ public class ComplexGainFactory
return new VectorComplexGain(gain); return new VectorComplexGain(gain);
} }
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarComplexGain(gain); return new ScalarComplexGain(gain);
} }

View File

@@ -52,6 +52,7 @@ public class MagnitudeFactory
case VECTOR_SIMD_512: case VECTOR_SIMD_512:
return new VectorMagnitudeCalculator512(); return new VectorMagnitudeCalculator512();
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarMagnitudeCalculator(); return new ScalarMagnitudeCalculator();
} }

View File

@@ -49,6 +49,7 @@ public class ComplexMixerFactory
return new VectorComplexMixer(frequency, sampleRate); return new VectorComplexMixer(frequency, sampleRate);
} }
case SCALAR: case SCALAR:
case UNCALIBRATED:
{ {
return new ScalarComplexMixer(frequency, sampleRate); return new ScalarComplexMixer(frequency, sampleRate);
} }

View File

@@ -49,6 +49,7 @@ public class OscillatorFactory
case VECTOR_SIMD_PREFERRED: case VECTOR_SIMD_PREFERRED:
return new VectorRealOscillator(frequency, sampleRate); return new VectorRealOscillator(frequency, sampleRate);
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarRealOscillator(frequency, sampleRate); return new ScalarRealOscillator(frequency, sampleRate);
} }
@@ -69,6 +70,7 @@ public class OscillatorFactory
case VECTOR_SIMD_PREFERRED: case VECTOR_SIMD_PREFERRED:
return new VectorComplexOscillator(frequency, sampleRate); return new VectorComplexOscillator(frequency, sampleRate);
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new ScalarComplexOscillator(frequency, sampleRate); return new ScalarComplexOscillator(frequency, sampleRate);
} }

View File

@@ -45,7 +45,8 @@ public class DifferentialDemodulatorFactory
case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate); case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate);
case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate); case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate);
case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate); case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate);
default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate); //Includes SCALAR case case SCALAR, UNCALIBRATED -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate);
default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate);
}; };
} }
} }

View File

@@ -660,7 +660,7 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef
nameColumn.setPrefWidth(140); nameColumn.setPrefWidth(140);
TableColumn groupColumn = new TableColumn(); TableColumn groupColumn = new TableColumn();
groupColumn.setText("Group"); groupColumn.setText("Category");
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
groupColumn.setPrefWidth(140); groupColumn.setPrefWidth(140);

View File

@@ -1094,7 +1094,7 @@ public class AliasItemEditor extends Editor<Alias>
GridPane.setConstraints(getColorPicker(), 7, row); GridPane.setConstraints(getColorPicker(), 7, row);
mTextFieldPane.getChildren().add(getColorPicker()); mTextFieldPane.getChildren().add(getColorPicker());
Label groupLabel = new Label("Group"); Label groupLabel = new Label("Category");
groupLabel.setLabelFor(getGroupField()); groupLabel.setLabelFor(getGroupField());
GridPane.setHalignment(groupLabel, HPos.RIGHT); GridPane.setHalignment(groupLabel, HPos.RIGHT);
GridPane.setConstraints(groupLabel, 0, ++row); GridPane.setConstraints(groupLabel, 0, ++row);

View File

@@ -243,7 +243,7 @@ public class AliasViewByIdentifierEditor extends VBox
aliasColumn.setPrefWidth(200); aliasColumn.setPrefWidth(200);
TableColumn<AliasAndIdentifier, String> groupColumn = new TableColumn<>(); TableColumn<AliasAndIdentifier, String> groupColumn = new TableColumn<>();
groupColumn.setText("Group"); groupColumn.setText("Category");
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
groupColumn.setPrefWidth(200); groupColumn.setPrefWidth(200);

View File

@@ -241,7 +241,7 @@ public class AliasViewByRecordingEditor extends VBox
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name")); nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name"));
TableColumn groupColumn = new TableColumn(); TableColumn groupColumn = new TableColumn();
groupColumn.setText("Group"); groupColumn.setText("Category");
groupColumn.setPrefWidth(200); groupColumn.setPrefWidth(200);
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
@@ -280,7 +280,7 @@ public class AliasViewByRecordingEditor extends VBox
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name")); nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name"));
TableColumn groupColumn = new TableColumn(); TableColumn groupColumn = new TableColumn();
groupColumn.setText("Group"); groupColumn.setText("Category");
groupColumn.setPrefWidth(200); groupColumn.setPrefWidth(200);
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));

View File

@@ -694,8 +694,8 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases"); mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases");
mAutoAddTalkerAliasesCheckBox.setDisable(true); mAutoAddTalkerAliasesCheckBox.setDisable(true);
mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " + mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " +
"the Talker Alias group. Only radio aliases in that group are automatically renamed; existing " + "the Talker Alias category. Only radio aliases in that category are automatically renamed; existing " +
"radio aliases outside the group are left unchanged. Move an alias out of the Talker Alias group " + "radio aliases outside the category are left unchanged. Move an alias out of the Talker Alias category " +
"to preserve a custom name. Applies when the channel is (re)started.")); "to preserve a custom name. Applies when the channel is (re)started."));
mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true)); mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true));
} }

View File

@@ -225,7 +225,7 @@ public class StreamAliasSelectionEditor extends VBox
aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName")); aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName"));
TableColumn groupColumn = new TableColumn(); TableColumn groupColumn = new TableColumn();
groupColumn.setText("Group"); groupColumn.setText("Category");
groupColumn.setPrefWidth(150); groupColumn.setPrefWidth(150);
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
@@ -270,7 +270,7 @@ public class StreamAliasSelectionEditor extends VBox
aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName")); aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName"));
TableColumn groupColumn = new TableColumn(); TableColumn groupColumn = new TableColumn();
groupColumn.setText("Group"); groupColumn.setText("Category");
groupColumn.setPrefWidth(150); groupColumn.setPrefWidth(150);
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group")); groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));

View File

@@ -52,6 +52,7 @@ public class DMRSoftSyncDetectorFactory
case VECTOR_SIMD_512: case VECTOR_SIMD_512:
return new DMRSoftSyncDetectorVector512(); return new DMRSoftSyncDetectorVector512();
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new DMRSoftSyncDetectorScalar(); return new DMRSoftSyncDetectorScalar();
} }

View File

@@ -51,6 +51,7 @@ public class NXDNSyncDetectorFactory
case VECTOR_SIMD_512: case VECTOR_SIMD_512:
return new NXDNSoftSyncDetectorVector512(); return new NXDNSoftSyncDetectorVector512();
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new NXDNSoftSyncDetectorScalar(); return new NXDNSoftSyncDetectorScalar();
} }

View File

@@ -52,6 +52,7 @@ public class P25P1SoftSyncDetectorFactory
case VECTOR_SIMD_512: case VECTOR_SIMD_512:
return new P25P1SoftSyncDetectorVector512(); return new P25P1SoftSyncDetectorVector512();
case SCALAR: case SCALAR:
case UNCALIBRATED:
default: default:
return new P25P1SoftSyncDetectorScalar(); return new P25P1SoftSyncDetectorScalar();
} }