Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: add operacake_activate_ports()

Browse Source 
Fixes frequency mode which had been broken by operacake_set_ports() only
activating the selected ports when in manual mode (at my suggestion).
This commit is contained in:
Michael Ossmann
2021-12-12 11:56:57 -07:00
parent 083f502413
commit e25096b17a
3 changed files with 74 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
firmware/common/operacake.c
View File

@ -151,38 +151,6 @@ void operacake_get_boards(uint8_t *addresses) {
} }
} }
void operacake_set_mode(uint8_t address, uint8_t mode) {
if (address >= OPERACAKE_MAX_BOARDS)
return;
operacake_boards[address].mode = mode;
if (mode == MODE_TIME) {
// Switch Opera Cake to pin-control mode
uint8_t config_pins = (uint8_t)~(OPERACAKE_PIN_OE(1) | OPERACAKE_PIN_LEDEN(1) | OPERACAKE_PIN_LEDEN2(1));
operacake_write_reg(oc_bus, address, OPERACAKE_REG_CONFIG, config_pins);
operacake_write_reg(oc_bus, address, OPERACAKE_REG_OUTPUT, OPERACAKE_GPIO_ENABLE | OPERACAKE_EN_LEDS);
} else {
operacake_write_reg(oc_bus, address, OPERACAKE_REG_CONFIG, OPERACAKE_CONFIG_ALL_OUTPUT);
operacake_set_ports(address, operacake_boards[address].PA, operacake_boards[address].PB);
}
// If any boards are in MODE_TIME, enable the sctimer events.
bool enable_sctimer = false;
for (int i = 0; i < OPERACAKE_MAX_BOARDS; i++) {
if (operacake_boards[i].mode == MODE_TIME)
enable_sctimer = true;
}
operacake_sctimer_enable(enable_sctimer);
}
uint8_t operacake_get_mode(uint8_t address) {
if (address >= OPERACAKE_MAX_BOARDS)
return 0;
return operacake_boards[address].mode;
}
uint8_t port_to_pins(uint8_t port) { uint8_t port_to_pins(uint8_t port) {
switch(port) { switch(port) {
case OPERACAKE_PA1: case OPERACAKE_PA1:
@ -206,46 +174,97 @@ uint8_t port_to_pins(uint8_t port) {
return 0xFF; return 0xFF;
} }
uint8_t operacake_set_ports(uint8_t address, uint8_t PA, uint8_t PB) { /*
uint8_t side, pa, pb, reg; * Issue I2C command to activate ports.
/* Start with some error checking,
* which should have been done either
* on the host or elsewhere in firmware
*/ */
if((PA > OPERACAKE_PB4) || (PB > OPERACAKE_PB4)) { uint8_t operacake_activate_ports(uint8_t address, uint8_t PA, uint8_t PB)
{
uint8_t side, pa, pb, reg;
/* Ensure PA and PB are within the valid range. */
if ((PA > OPERACAKE_PB4) || (PB > OPERACAKE_PB4)) {
return 1; return 1;
} }
/* Check which side PA and PB are on */ /* Ensure PA and PB are on opposite sides. */
if(((PA <= OPERACAKE_PA4) && (PB <= OPERACAKE_PA4)) if (((PA <= OPERACAKE_PA4) && (PB <= OPERACAKE_PA4))
|| ((PA > OPERACAKE_PA4) && (PB > OPERACAKE_PA4))) { || ((PA > OPERACAKE_PA4) && (PB > OPERACAKE_PA4))) {
return 1; return 1;
} }
if(PA > OPERACAKE_PA4) { if (PA > OPERACAKE_PA4) {
side = OPERACAKE_CROSSOVER; side = OPERACAKE_CROSSOVER;
} else { } else {
side = OPERACAKE_SAMESIDE; side = OPERACAKE_SAMESIDE;
} }
pa = port_to_pins(PA);
pb = port_to_pins(PB);
reg = (OPERACAKE_GPIO_DISABLE | side | pa | pb | OPERACAKE_EN_LEDS);
operacake_write_reg(oc_bus, address, OPERACAKE_REG_OUTPUT, reg);
return 0;
}
void operacake_set_mode(uint8_t address, uint8_t mode) {
if (address >= OPERACAKE_MAX_BOARDS)
return;
operacake_boards[address].mode = mode;
if (mode == MODE_TIME) {
// Switch Opera Cake to pin-control mode
uint8_t config_pins = (uint8_t)~(OPERACAKE_PIN_OE(1) | OPERACAKE_PIN_LEDEN(1) | OPERACAKE_PIN_LEDEN2(1));
operacake_write_reg(oc_bus, address, OPERACAKE_REG_CONFIG, config_pins);
operacake_write_reg(oc_bus, address, OPERACAKE_REG_OUTPUT, OPERACAKE_GPIO_ENABLE | OPERACAKE_EN_LEDS);
} else {
operacake_write_reg(oc_bus, address, OPERACAKE_REG_CONFIG, OPERACAKE_CONFIG_ALL_OUTPUT);
operacake_activate_ports(address, operacake_boards[address].PA, operacake_boards[address].PB);
}
// If any boards are in MODE_TIME, enable the sctimer events.
bool enable_sctimer = false;
for (int i = 0; i < OPERACAKE_MAX_BOARDS; i++) {
if (operacake_boards[i].mode == MODE_TIME)
enable_sctimer = true;
}
operacake_sctimer_enable(enable_sctimer);
}
uint8_t operacake_get_mode(uint8_t address) {
if (address >= OPERACAKE_MAX_BOARDS)
return 0;
return operacake_boards[address].mode;
}
/*
* Set manual mode ports.
*/
uint8_t operacake_set_ports(uint8_t address, uint8_t PA, uint8_t PB)
{
/* Ensure PA and PB are within the valid range. */
if ((PA > OPERACAKE_PB4) || (PB > OPERACAKE_PB4)) {
return 1;
}
/* Ensure PA and PB are on opposite sides. */
if (((PA <= OPERACAKE_PA4) && (PB <= OPERACAKE_PA4))
|| ((PA > OPERACAKE_PA4) && (PB > OPERACAKE_PA4))) {
return 1;
}
// Keep track of manual settings for when we switch in/out of time/frequency modes. // Keep track of manual settings for when we switch in/out of time/frequency modes.
operacake_boards[address].PA = PA; operacake_boards[address].PA = PA;
operacake_boards[address].PB = PB; operacake_boards[address].PB = PB;
// Only apply register settings if the board is in manual mode. // Immediately apply register settings if the board is in manual mode.
if (operacake_boards[address].mode != MODE_MANUAL) if (operacake_boards[address].mode == MODE_MANUAL) {
return 0; return operacake_activate_ports(address, PA, PB);
}
pa = port_to_pins(PA);
pb = port_to_pins(PB);
reg = (OPERACAKE_GPIO_DISABLE | side
| pa | pb | OPERACAKE_EN_LEDS);
operacake_write_reg(oc_bus, address, OPERACAKE_REG_OUTPUT, reg);
return 0; return 0;
} }
/* /*
* Opera Glasses * frequency mode aka "Opera Glasses"
*/ */
typedef struct { typedef struct {
uint16_t freq_min; uint16_t freq_min;
@ -291,7 +310,7 @@ uint8_t operacake_set_range(uint32_t freq_mhz) {
for (int i = 0; i < OPERACAKE_MAX_BOARDS; i++) { for (int i = 0; i < OPERACAKE_MAX_BOARDS; i++) {
if (operacake_is_board_present(i) && operacake_get_mode(i) == MODE_FREQUENCY) { if (operacake_is_board_present(i) && operacake_get_mode(i) == MODE_FREQUENCY) {
operacake_set_ports(i, ranges[range].portA, ranges[range].portB); operacake_activate_ports(i, ranges[range].portA, ranges[range].portB);
break; break;
} }
} }

2
host/libhackrf/src/hackrf.c
View File

@ -2204,7 +2204,7 @@ int ADDCALL hackrf_get_operacake_mode(hackrf_device* device, uint8_t address, en
} }
} }
/* Set Operacake ports */ /* Set Operacake manual mode ports. */
int ADDCALL hackrf_set_operacake_ports(hackrf_device* device, int ADDCALL hackrf_set_operacake_ports(hackrf_device* device,
uint8_t address, uint8_t address,
uint8_t port_a, uint8_t port_a,

2
host/libhackrf/src/hackrf.h
View File

@ -110,7 +110,7 @@ enum operacake_switching_mode {
*/ */
OPERACAKE_MODE_MANUAL, OPERACAKE_MODE_MANUAL,
/** /**
* Port connections are switched automatically when the frequency is changed. Frequency ranges can be set using @ref hackrf_set_operacake_ranges. * Port connections are switched automatically when the frequency is changed. Frequency ranges can be set using @ref hackrf_set_operacake_freq_ranges.
*/ */
OPERACAKE_MODE_FREQUENCY, OPERACAKE_MODE_FREQUENCY,
/** /**