Stephan/irena-arm
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Stephan:87c50652ff628e15522fe346e06d9b9ade7a3cc5
Branches Tags
Stephan:master
Stephan:dlrena
..
compare: Stephan:494ec955c59c66dee58c76657c542b5740e51874
Branches Tags
Stephan:master
Stephan:dlrena

No commits in common. "87c50652ff628e15522fe346e06d9b9ade7a3cc5" and "494ec955c59c66dee58c76657c542b5740e51874" have entirely different histories.
87c50652ff ... 494ec955c5

3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ads8688.c
View file

@ -404,7 +404,7 @@ int adc_frame_cmd(struct command *cmd, const struct command_par *par)
int r = 0; int r = 0;
int n = 1; int n = 1;
if (frame & 0x8000 || !frame) { if (frame & 0x8000) {
if (frame == 0xc000) if (frame == 0xc000)
frame |= ch << 10; frame |= ch << 10;
if (!e) if (!e)

2
pressure.c
View file

@ -260,7 +260,7 @@ int read_bate(int from_phase, int to_phase, int value, int idx)
case 9: if (phase==to_phase) case 9: if (phase==to_phase)
timeout = value; timeout = value;
else else
timeout = 10000; timeout = 1000;
r = ssp_wait(timeout); r = ssp_wait(timeout);
break; break;
case 3: pressure_reading[3] = pressure_reading[2]; case 3: pressure_reading[3] = pressure_reading[2];

3
ssp.c
View file

@ -256,6 +256,7 @@ unsigned int ssp_busy(void)
const unsigned int mask = 0xffff const unsigned int mask = 0xffff
| (SSPSR_RNE << 16) | (SSPSR_RNE << 16)
| (SSPSR_BSY << 16) | (SSPSR_BSY << 16)
| (SSP_INT_RX << 24)
| (SSP_INT_TX << 24) | (SSP_INT_TX << 24)
; ;
if (c & mask) if (c & mask)
@ -283,7 +284,7 @@ struct ssp_config ssp_confs[] = {
.ssel = SSP_ADS8688, .ssel = SSP_ADS8688,
}, },
{ {
.mode = SSPCR0_16bits | SSP_kHz(5000), .mode = SSPCR0_16bits | SSP_kHz(30000),
.ssel = SSP_LTC2656, .ssel = SSP_LTC2656,
}, },
{ {