This dataset contains the research data (code and measurement data) of the journal article: J. A. Braun, R. Behmann, D. Schmider, W. G. Bessler, "State of charge and state of health diagnosis of batteries with voltage-controlled models", Journal of Power Sources 544 (2022), 231828. Abstract: The accurate diagnosis of state of charge (SOC) and state of health (SOH) is of utmost importance for battery users and for battery manufacturers. State diagnosis is commonly based on measuring battery current and using it in Coulomb counters or as input for a current-controlled model. Here we introduce a new algorithm based on measuring battery voltage and using it as input for a voltage-controlled model. We demonstrate the algorithm using fresh and pre-aged lithium-ion battery single cells operated under well-defined laboratory conditions on full cycles, shallow cycles, and a dynamic battery electric vehicle load profile. We show that both SOC and SOH are accurately estimated using a simple equivalent circuit model. The new algorithm is self-calibrating, is robust with respect to cell aging, allows to estimate SOH from arbitrary load profiles, and is numerically simpler than state-of-the-art model-based methods. Intellectual property information: The Matlab codes and the research data provided here are under CC-BY-NC-4.0 license. Please note that the algorithms themselves are subject to industrial property rights, including, but not necessarily limited to, German patent DE102019127828B4 and international patent application WO2021073690A2. Any use of the codes and algorithms presented here is subject to these property rights. Overview of files: SOC_SOH_simple_model.m: Matlab script performing SOC and SOH diagnosis with the voltage-controlled "simple" equivalent circuit model. The script also reproduces the figures shown in the manuscript. SOC_SOH_simple_extended.m: Matlab script performing SOC and SOH diagnosis with the voltage-controlled "extended" equivalent circuit model. The script also creates figures of additional data not shown in the manuscript. Experimental_data_fresh_cell.csv: Tabulated experimental data (time, current, voltage, temperature) of the long-term experiment (99 h total with 1 s resolution) of a fresh lithium-ion cell. The cell is initally completely discharged. The data consist of full cycling, shallow cycling, and WLTP cycling. Experimental_data_aged_cell.csv: Tabulated experimental data (time, current, voltage, temperature) of the long-term experiment (85 h total with 1 s resolution) of a pre-aged lithium-ion cell. The cell is initally completely discharged. The data consist of full cycling, shallow cycling, and WLTP cycling. OCV_vs_SOC_curve.csv: Tabulated experimentally-derived open-circuit voltage (OCV) as function of state of charge (SOC). 1001 data points between SOC = 0 and SOC = 1 in increments of 0.001. readme.txt: Overview of files with a short description.