Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r5147570b8c12a721fe05ec9aa5dd38baa6c3a931 -r275ee4fdc1ace09febcf9788c80171f7a6372c99 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 5147570b8c12a721fe05ec9aa5dd38baa6c3a931) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 275ee4fdc1ace09febcf9788c80171f7a6372c99) @@ -303,34 +303,33 @@ U16 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control - U16 valveControl; ///< Reg 79. Valve control register. - U08 notused; ///< Reg 81. Not used + U08 notused; ///< Reg 79. Not used + U16 valveControl; ///< Reg 80. Valve control register. U08 conductivityP9Control; ///< Reg 82. P9 conductivity control register. U08 conductivityP18Control; ///< Reg 83. P18 conductivity control register. U16 conductivityP9Address; ///< Reg 84. P9 conductivity address register. U32 conductivityP9Data; ///< Reg 86. P9 conductivity data in register. U16 conductivityP18Address; ///< Reg 90. P18 conductivity address register. U32 conductivityP18Data; ///< Reg 92. P18 conductivity data in register. - U16 fpgaGenWrRd; ///< Reg 96. FPGA general write/read-back register (mirrored to a general read register in read page at addr 256). - U16 descalePumpSpeed; ///< Reg 98. Descaler pump speed register. - U08 descalePumpControl; ///< Reg 100. Descaler pump control register. - U08 p12PumpControl; ///< Reg 101. P12 pump control register. - U16 valveVwiPWMLow; ///< Reg 102. Valve VWi PWM low pulse period in 0.1 uSec. - U16 valveVwiPWMPeriod; ///< Reg 104. Valve VWi PWM full period in 0.1 uSec. - U16 valvePWMPullIn; ///< Reg 106. Valve PWM high pulse period when valve is on in 0.1 uSec. - U16 p12PumpPWMDutyCyclePct; ///< Reg 108. P12 pump PWM duty cycle in percentage. - U16 p40PumpPWMDutyCyclePct; ///< Reg 110. P40 pump PWM duty cycle in percentage. - U08 p40PumpControl; ///< Reg 112. P40 pump control register. - U08 reserved1; ///< Reg 113. Reserved. - U08 flowControlp7; ///< Reg 114. P7 AVS Romer flow sensor control register. - U08 flowAddressp7; ///< Reg 115. P7 AVS Romer flow sensor I2C slave address register. - U16 valvePWMEnable; ///< Reg 116. Valve PWM enable register. - U08 flowControlp16; ///< Reg 118. P16 AVS Romer flow sensor control register. - U08 flowAddressp16; ///< Reg 119. P16 AVS Romer flow sensor I2C slave address register. + U16 descalePumpSpeed; ///< Reg 96. Descaler pump speed register. + U08 descalePumpControl; ///< Reg 98. Descaler pump control register. + U08 p12PumpControl; ///< Reg 99. P12 pump control register. + U16 valveVwiPWMLow; ///< Reg 100. Valve VWi PWM low pulse period in 0.1 uSec. + U16 valveVwiPWMPeriod; ///< Reg 102. Valve VWi PWM full period in 0.1 uSec. + U16 valvePWMPullIn; ///< Reg 104. Valve PWM high pulse period when valve is on in 0.1 uSec. + U16 p12PumpPWMDutyCyclePct; ///< Reg 106. P12 pump PWM duty cycle in percentage. + U16 p40PumpPWMDutyCyclePct; ///< Reg 108. P40 pump PWM duty cycle in percentage. + U08 p40PumpControl; ///< Reg 110. P40 pump control register. + U08 reserved1; ///< Reg 111. Reserved. + U08 flowControlp7; ///< Reg 112. P7 AVS Romer flow sensor control register. + U08 flowAddressp7; ///< Reg 113. P7 AVS Romer flow sensor I2C slave address register. + U16 valvePWMEnable; ///< Reg 114. Valve PWM enable register. + U08 flowControlp16; ///< Reg 116. P16 AVS Romer flow sensor control register. + U08 flowAddressp16; ///< Reg 117. P16 AVS Romer flow sensor I2C slave address register. - U08 fpgaConSensD43Control; ///< Reg 120. Conductivity/Temperature Sensors D43 Control registers - U16 fpgaConSensD43_Addrs; ///< Reg 121. D43 Initialization Address register - U32 fpgaConSensD43_Data_In; ///< Reg 123. D43 Initialization data register + U08 fpgaConSensD43Control; ///< Reg 118. Conductivity/Temperature Sensors D43 Control registers + U16 fpgaConSensD43_Addrs; ///< Reg 119. D43 Initialization Address register + U32 fpgaConSensD43_Data_In; ///< Reg 121. D43 Initialization data register } FPGA_ACTUATORS_T; #pragma pack(pop)