Skip to content

Commit 77b2f97

Browse files
committed
Version bump 1.8.6 & command flags
1 parent 42957ed commit 77b2f97

7 files changed

Lines changed: 23 additions & 38 deletions

File tree

Firmware/FFBoard/Inc/ClassChooser.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -123,27 +123,6 @@ class ClassChooser {
123123
return false;
124124
}
125125

126-
/**
127-
* Returns a string of classes available to this classchooser
128-
* ignoredCreatableId will list as creatable even if it is not. Useful to make a single class list as valid if it was already chosen
129-
*/ // TODO REMOVE
130-
std::string printAvailableClasses(int16_t ignoredCreatableId = 255){
131-
std::string ret;
132-
for(class_entry<T> cls : class_registry){
133-
if(cls.info.visibility == ClassVisibility::hidden || (cls.info.visibility == ClassVisibility::debug && !SystemCommands::allowDebugCommands)){
134-
if(ignoredCreatableId != cls.selectionId)
135-
continue;
136-
}
137-
138-
ret+= std::to_string(cls.selectionId);
139-
ret+= ":";
140-
ret+= (cls.isCreatable() || ignoredCreatableId == cls.selectionId) ? "1" : "0";
141-
ret+= ":";
142-
ret+= cls.info.name;
143-
ret+='\n';
144-
}
145-
return ret;
146-
}
147126

148127
/**
149128
* Generates replies for the command system listing selectable classes

Firmware/FFBoard/Inc/CommandHandler.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,13 @@ class CommandHandler {
238238

239239
std::vector<CmdHandlerCommanddef> registeredCommands;
240240

241-
// Helper to be used with class enums
241+
/**
242+
* Registers a command for this command handler
243+
* @param[in] cmd string name of command for serial interface
244+
* @param[in] cmdid id enum for command for HID
245+
* @param[in] help help message displayed on serial interface
246+
* @param[in] flags what access methods are available for a command (see CMDFLAG definitions)
247+
*/
242248
template<typename ID>
243249
void registerCommand(const char* cmd,const ID cmdid,const char* help=nullptr,uint32_t flags = 0){
244250
for(CmdHandlerCommanddef& cmdDef : registeredCommands){

Firmware/FFBoard/Inc/constants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313

14-
static const uint8_t SW_VERSION_INT[3] = {1,8,5}; // Version as array. 8 bit each!
14+
static const uint8_t SW_VERSION_INT[3] = {1,8,6}; // Version as array. 8 bit each!
1515

1616
#define MAX_AXIS 2 // ONLY USE 2 for now else screws HID Reports
1717

Firmware/FFBoard/UserExtensions/Src/EncoderLocal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ EncoderLocal::EncoderLocal() : CommandHandler("localenc",CLSID_ENCODER_LOCAL) {
2929

3030
void EncoderLocal::registerCommands(){
3131
CommandHandler::registerCommands();
32-
registerCommand("cpr", EncoderLocal_commands::cpr, "CPR of encoder");
32+
registerCommand("cpr", EncoderLocal_commands::cpr, "CPR of encoder",CMDFLAG_GET|CMDFLAG_SET);
3333
}
3434

3535
EncoderLocal::~EncoderLocal() {

Firmware/FFBoard/UserExtensions/Src/MidiMain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ MidiMain::MidiMain(){
6464

6565

6666
//CommandHandler::registerCommands();
67-
registerCommand("power", MidiMain_commands::power, "Intensity");
68-
registerCommand("range", MidiMain_commands::range, "Range of phase change");
67+
registerCommand("power", MidiMain_commands::power, "Intensity",CMDFLAG_GET|CMDFLAG_SET);
68+
registerCommand("range", MidiMain_commands::range, "Range of phase change",CMDFLAG_GET|CMDFLAG_SET);
6969

7070
HAL_TIM_Base_Start_IT(this->timer_update);
7171
}

Firmware/FFBoard/UserExtensions/Src/ShifterAnalog.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ ShifterAnalog::~ShifterAnalog() {
3232
void ShifterAnalog::registerCommands(){
3333
CommandHandler::registerCommands();
3434

35-
registerCommand("mode", ShifterAnalog_commands::mode, "Shifter mode");
36-
registerCommand("x12", ShifterAnalog_commands::x12, "X-threshold for 1,2 gears");
37-
registerCommand("x56", ShifterAnalog_commands::x56, "X-threshold for 5,6 gears");
38-
registerCommand("y135", ShifterAnalog_commands::y135, "Y-threshold for 1,3,5 gears");
39-
registerCommand("y246", ShifterAnalog_commands::y246, "Y-threshold for 2,4,6 gears");
40-
registerCommand("revbtn", ShifterAnalog_commands::revbtn, "Pin for R signal");
41-
registerCommand("cspin", ShifterAnalog_commands::cspin, "CS pin for SPI modes");
42-
registerCommand("xchan", ShifterAnalog_commands::xchan, "X signal analog pin");
43-
registerCommand("ychan", ShifterAnalog_commands::ychan, "Y signal analog pin");
44-
registerCommand("vals", ShifterAnalog_commands::vals, "Analog values");
45-
registerCommand("gear", ShifterAnalog_commands::gear, "Decoded gear");
35+
registerCommand("mode", ShifterAnalog_commands::mode, "Shifter mode",CMDFLAG_GET|CMDFLAG_SET|CMDFLAG_INFOSTRING);
36+
registerCommand("x12", ShifterAnalog_commands::x12, "X-threshold for 1,2 gears",CMDFLAG_GET|CMDFLAG_SET);
37+
registerCommand("x56", ShifterAnalog_commands::x56, "X-threshold for 5,6 gears",CMDFLAG_GET|CMDFLAG_SET);
38+
registerCommand("y135", ShifterAnalog_commands::y135, "Y-threshold for 1,3,5 gears",CMDFLAG_GET|CMDFLAG_SET);
39+
registerCommand("y246", ShifterAnalog_commands::y246, "Y-threshold for 2,4,6 gears",CMDFLAG_GET|CMDFLAG_SET);
40+
registerCommand("revbtn", ShifterAnalog_commands::revbtn, "Pin for R signal",CMDFLAG_GET|CMDFLAG_SET);
41+
registerCommand("cspin", ShifterAnalog_commands::cspin, "CS pin for SPI modes",CMDFLAG_GET|CMDFLAG_SET);
42+
registerCommand("xchan", ShifterAnalog_commands::xchan, "X signal analog pin",CMDFLAG_GET|CMDFLAG_SET);
43+
registerCommand("ychan", ShifterAnalog_commands::ychan, "Y signal analog pin",CMDFLAG_GET|CMDFLAG_SET);
44+
registerCommand("vals", ShifterAnalog_commands::vals, "Analog values",CMDFLAG_GET);
45+
registerCommand("gear", ShifterAnalog_commands::gear, "Decoded gear",CMDFLAG_GET);
4646
}
4747

4848
void ShifterAnalog::updateAdc(){

0 commit comments

Comments
 (0)