andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-09-01 23:02:45 -05:00
parent 7e2f3c16f2
commit a66d0211ea
7 changed files with 311 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/algo/engine_configuration.h
View File

@ -184,9 +184,10 @@ typedef struct {
brain_pin_e o2heaterPin;
pin_output_mode_e o2heaterPinModeTodO;
unsigned int is_enabled_spi_1 : 1;
unsigned int is_enabled_spi_2 : 1;
unsigned int is_enabled_spi_3 : 1;
unsigned int is_enabled_spi_1 : 1; // bit 0
unsigned int is_enabled_spi_2 : 1; // bit 1
unsigned int is_enabled_spi_3 : 1; // bit 2
unsigned int isSdCardEnabled : 1; // bit 3
int unused2[6];

548
firmware/hw_layer/mmc_card.c
View File

@ -1,275 +1,273 @@
/**
* @file mmc_card.c
*
* @date Dec 28, 2013
* @author Kot_dnz
* @author Andrey Belomutskiy, (c) 2012-2014
*
* default pinouts in case of SPI2 connected to MMC: PB13 - SCK, PB14 - MISO, PB15 - MOSI, PD4 - CS, 3.3v
* default pinouts in case of SPI3 connected to MMC: PB3 - SCK, PB4 - MISO, PB5 - MOSI, PD4 - CS, 3.3v
*
*/
#include "main.h"
#if EFI_FILE_LOGGING || defined(__DOXYGEN__)
#include <stdio.h>
#include <string.h>
#include "mmc_card.h"
#include "pin_repository.h"
#include "ff.h"
#include "hardware.h"
#define PUSHPULLDELAY 500
static THD_WORKING_AREA(tp_MMC_Monitor,UTILITY_THREAD_STACK_SIZE); // MMC monitor thread
/**
* MMC driver instance.
*/
MMCDriver MMCD1;
// Peripherial Clock 42MHz SPI2 SPI3
// Peripherial Clock 84MHz SPI1 SPI1 SPI2/3
#define SPI_BaudRatePrescaler_2 ((uint16_t)0x0000) // 42 MHz 21 MHZ
#define SPI_BaudRatePrescaler_4 ((uint16_t)0x0008) // 21 MHz 10.5 MHz
#define SPI_BaudRatePrescaler_8 ((uint16_t)0x0010) // 10.5 MHz 5.25 MHz
#define SPI_BaudRatePrescaler_16 ((uint16_t)0x0018) // 5.25 MHz 2.626 MHz
#define SPI_BaudRatePrescaler_32 ((uint16_t)0x0020) // 2.626 MHz 1.3125 MHz
#define SPI_BaudRatePrescaler_64 ((uint16_t)0x0028) // 1.3125 MHz 656.25 KHz
#define SPI_BaudRatePrescaler_128 ((uint16_t)0x0030) // 656.25 KHz 328.125 KHz
#define SPI_BaudRatePrescaler_256 ((uint16_t)0x0038) // 328.125 KHz 164.06 KHz
static SPIConfig hs_spicfg = { NULL, SPI_SD_MODULE_PORT, SPI_SD_MODULE_PIN,
SPI_BaudRatePrescaler_8 };
static SPIConfig ls_spicfg = { NULL, SPI_SD_MODULE_PORT, SPI_SD_MODULE_PIN,
SPI_BaudRatePrescaler_256 };
/* MMC/SD over SPI driver configuration.*/
// don't forget check if STM32_SPI_USE_SPI2 defined and spi has init with correct GPIO in hardware.c
static MMCConfig mmccfg = { &MMC_CARD_SPI, &ls_spicfg, &hs_spicfg };
static bool fs_ready = false;
#define PUSHPULLDELAY 500
/**
* fatfs MMC/SPI
*/
static FATFS MMC_FS;
static Logging logger;
// print FAT error function
static void printError(char *str, FRESULT f_error) {
scheduleMsg(&logger, "FATfs Error \"%s\" %d", str, f_error);
}
static FIL FDLogFile;
static int totalLoggedBytes = 0;
static void printMmcPinout(void) {
scheduleMsg(&logger, "MMC CS %s:%d", portname(SPI_SD_MODULE_PORT), SPI_SD_MODULE_PIN);
// todo: we need to figure out the right SPI pinout, not just SPI2
// scheduleMsg(&logger, "MMC SCK %s:%d", portname(EFI_SPI2_SCK_PORT), EFI_SPI2_SCK_PIN);
// scheduleMsg(&logger, "MMC MISO %s:%d", portname(EFI_SPI2_MISO_PORT), EFI_SPI2_MISO_PIN);
// scheduleMsg(&logger, "MMC MOSI %s:%d", portname(EFI_SPI2_MOSI_PORT), EFI_SPI2_MOSI_PIN);
}
static void sdStatistics(void) {
printMmcPinout();
scheduleMsg(&logger, "fs_ready=%d totalLoggedBytes=%d", fs_ready, totalLoggedBytes);
}
/**
* @brief Create a new file with the specified name
*
* This function saves the name of the file in a global variable
* so that we can later append to that file
*/
static void createLogFile(void) {
lockSpi(SPI_NONE);
memset(&FDLogFile, 0, sizeof(FIL)); // clear the memory
FRESULT err = f_open(&FDLogFile, "rusefi.log", FA_OPEN_ALWAYS | FA_WRITE); // Create new file
if (err != FR_OK && err != FR_EXIST) {
unlockSpi();
printError("Card mounted...\r\nCan't create Log file, check your SD.\r\nFS mount failed", err); // else - show error
return;
}
err = f_lseek(&FDLogFile, f_size(&FDLogFile)); // Move to end of the file to append data
if (err) {
unlockSpi();
printError("Seek error", err);
return;
}
f_sync(&FDLogFile);
fs_ready = true; // everything Ok
unlockSpi();
}
static void ff_cmd_dir(char *path) {
DIR dir;
FILINFO fno;
char *fn;
if (!fs_ready) {
scheduleMsg(&logger, "Error: No File system is mounted");
return;
}
FRESULT res = f_opendir(&dir, path);
if (res != FR_OK) {
scheduleMsg(&logger, "Error opening directory %s", path);
return;
}
int i = strlen(path);
for (;;) {
res = f_readdir(&dir, &fno);
if (res != FR_OK || fno.fname[0] == 0)
break;
if (fno.lfname[0] == '.')
continue;
fn = fno.lfname;
if (fno.fattrib & AM_DIR) {
// TODO: WHAT? WE ARE APPENDING FILE NAME TO PARAMETER??? WEIRD!!!
path[i++] = '/';
strcpy(&path[i], fn);
// res = ff_cmd_ls(path);
if (res != FR_OK)
break;
path[i] = 0;
} else {
scheduleMsg(&logger, "%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %-12s", (fno.fattrib & AM_DIR) ? 'D' : '-',
(fno.fattrib & AM_RDO) ? 'R' : '-', (fno.fattrib & AM_HID) ? 'H' : '-',
(fno.fattrib & AM_SYS) ? 'S' : '-', (fno.fattrib & AM_ARC) ? 'A' : '-', (fno.fdate >> 9) + 1980,
(fno.fdate >> 5) & 15, fno.fdate & 31, (fno.ftime >> 11), (fno.ftime >> 5) & 63, fno.fsize,
fno.fname);
}
}
}
static int errorReported = FALSE; // this is used to report the error only once
/**
* @brief Appends specified line to the current log file
*/
void appendToLog(char *line) {
UINT bytesWrited;
if (!fs_ready) {
if (!errorReported)
scheduleMsg(&logger, "appendToLog Error: No File system is mounted");
errorReported = TRUE;
return;
}
UINT lineLength = strlen(line);
totalLoggedBytes += lineLength;
lockSpi(SPI_NONE);
FRESULT err = f_write(&FDLogFile, line, lineLength, &bytesWrited);
if (bytesWrited < lineLength) {
printError("write error or disk full", err); // error or disk full
}
f_sync(&FDLogFile);
unlockSpi();
}
/*
* MMC card umount.
*/
static void MMCumount(void) {
if (!fs_ready) {
scheduleMsg(&logger, "Error: No File system is mounted. \"mountsd\" first");
return;
}
f_close(&FDLogFile); // close file
f_sync(&FDLogFile); // sync ALL
mmcDisconnect(&MMCD1); // Brings the driver in a state safe for card removal.
mmcStop(&MMCD1); // Disables the MMC peripheral.
f_mount(0, NULL); // FATFS: Unregister work area prior to discard it
memset(&FDLogFile, 0, sizeof(FIL)); // clear FDLogFile
fs_ready = false; // status = false
scheduleMsg(&logger, "MMC/SD card removed");
}
/*
* MMC card mount.
*/
static void MMCmount(void) {
// printMmcPinout();
if (fs_ready) {
scheduleMsg(&logger, "Error: Already mounted. \"umountsd\" first");
return;
}
// start to initialize MMC/SD
mmcObjectInit(&MMCD1); // Initializes an instance.
mmcStart(&MMCD1, &mmccfg); // Configures and activates the MMC peripheral.
// Performs the initialization procedure on the inserted card.
lockSpi(SPI_NONE);
if (mmcConnect(&MMCD1) != CH_SUCCESS) {
warning(OBD_PCM_Processor_Fault, "Can't connect or mount MMC/SD");
unlockSpi();
return;
}
unlockSpi();
// if Ok - mount FS now
memset(&MMC_FS, 0, sizeof(FATFS)); // reserve the memory
if (f_mount(0, &MMC_FS) == FR_OK) {
createLogFile();
scheduleMsg(&logger, "MMC/SD mounted!\r\nDon't forget umountsd before remove to prevent lost your data");
}
}
#if defined __GNUC__
__attribute__((noreturn)) static msg_t MMCmonThread(void)
#else
static msg_t MMCmonThread(void)
#endif
{
chRegSetThreadName("MMC_Monitor");
while (true) {
// this returns TRUE if SD module is there, even without an SD card?
if (blkIsInserted(&MMCD1)) {
if (!fs_ready) {
MMCmount();
}
}
// this thread is activated 10 times per second
chThdSleepMilliseconds(PUSHPULLDELAY);
}
}
bool isSdCardAlive(void) {
return fs_ready;
}
void initMmcCard(void) {
initLogging(&logger, "mmcCard");
/**
* FYI: SPI does not work with CCM memory, be sure to have main() stack in RAM, not in CCMRAM
*/
// start to initialize MMC/SD
mmcObjectInit(&MMCD1);
mmcStart(&MMCD1, &mmccfg);
chThdCreateStatic(tp_MMC_Monitor, sizeof(tp_MMC_Monitor), LOWPRIO, (tfunc_t) MMCmonThread, NULL);
addConsoleAction("sdstat", sdStatistics);
addConsoleAction("mountsd", MMCmount);
addConsoleActionS("appendToLog", appendToLog);
addConsoleAction("umountsd", MMCumount);
addConsoleActionS("ls", ff_cmd_dir);
}
#endif /* EFI_FILE_LOGGING */
/**
* @file mmc_card.c
*
* @date Dec 28, 2013
* @author Kot_dnz
* @author Andrey Belomutskiy, (c) 2012-2014
*
* default pinouts in case of SPI2 connected to MMC: PB13 - SCK, PB14 - MISO, PB15 - MOSI, PD4 - CS, 3.3v
* default pinouts in case of SPI3 connected to MMC: PB3 - SCK, PB4 - MISO, PB5 - MOSI, PD4 - CS, 3.3v
*
*/
#include "main.h"
#if EFI_FILE_LOGGING || defined(__DOXYGEN__)
#include <stdio.h>
#include <string.h>
#include "mmc_card.h"
#include "pin_repository.h"
#include "ff.h"
#include "hardware.h"
#include "engine_configuration.h"
extern board_configuration_s *boardConfiguration;
#define PUSHPULLDELAY 500
static THD_WORKING_AREA(tp_MMC_Monitor,UTILITY_THREAD_STACK_SIZE); // MMC monitor thread
/**
* MMC driver instance.
*/
MMCDriver MMCD1;
// Peripherial Clock 42MHz SPI2 SPI3
// Peripherial Clock 84MHz SPI1 SPI1 SPI2/3
#define SPI_BaudRatePrescaler_2 ((uint16_t)0x0000) // 42 MHz 21 MHZ #define SPI_BaudRatePrescaler_4 ((uint16_t)0x0008) // 21 MHz 10.5 MHz #define SPI_BaudRatePrescaler_8 ((uint16_t)0x0010) // 10.5 MHz 5.25 MHz #define SPI_BaudRatePrescaler_16 ((uint16_t)0x0018) // 5.25 MHz 2.626 MHz #define SPI_BaudRatePrescaler_32 ((uint16_t)0x0020) // 2.626 MHz 1.3125 MHz #define SPI_BaudRatePrescaler_64 ((uint16_t)0x0028) // 1.3125 MHz 656.25 KHz #define SPI_BaudRatePrescaler_128 ((uint16_t)0x0030) // 656.25 KHz 328.125 KHz #define SPI_BaudRatePrescaler_256 ((uint16_t)0x0038) // 328.125 KHz 164.06 KHz static SPIConfig hs_spicfg = { NULL, SPI_SD_MODULE_PORT, SPI_SD_MODULE_PIN,
SPI_BaudRatePrescaler_8 };
static SPIConfig ls_spicfg = { NULL, SPI_SD_MODULE_PORT, SPI_SD_MODULE_PIN,
SPI_BaudRatePrescaler_256 };
/* MMC/SD over SPI driver configuration.*/
// don't forget check if STM32_SPI_USE_SPI2 defined and spi has init with correct GPIO in hardware.c
static MMCConfig mmccfg = { &MMC_CARD_SPI, &ls_spicfg, &hs_spicfg };
static bool fs_ready = false;
#define PUSHPULLDELAY 500
/**
* fatfs MMC/SPI
*/
static FATFS MMC_FS;
static Logging logger;
// print FAT error function
static void printError(char *str, FRESULT f_error) {
scheduleMsg(&logger, "FATfs Error \"%s\" %d", str, f_error);
}
static FIL FDLogFile;
static int totalLoggedBytes = 0;
static void printMmcPinout(void) {
scheduleMsg(&logger, "MMC CS %s:%d", portname(SPI_SD_MODULE_PORT), SPI_SD_MODULE_PIN);
// todo: we need to figure out the right SPI pinout, not just SPI2
// scheduleMsg(&logger, "MMC SCK %s:%d", portname(EFI_SPI2_SCK_PORT), EFI_SPI2_SCK_PIN);
// scheduleMsg(&logger, "MMC MISO %s:%d", portname(EFI_SPI2_MISO_PORT), EFI_SPI2_MISO_PIN);
// scheduleMsg(&logger, "MMC MOSI %s:%d", portname(EFI_SPI2_MOSI_PORT), EFI_SPI2_MOSI_PIN);
}
static void sdStatistics(void) {
printMmcPinout();
scheduleMsg(&logger, "fs_ready=%d totalLoggedBytes=%d", fs_ready, totalLoggedBytes);
}
/**
* @brief Create a new file with the specified name
*
* This function saves the name of the file in a global variable
* so that we can later append to that file
*/
static void createLogFile(void) {
lockSpi(SPI_NONE);
memset(&FDLogFile, 0, sizeof(FIL)); // clear the memory
FRESULT err = f_open(&FDLogFile, "rusefi.log", FA_OPEN_ALWAYS | FA_WRITE); // Create new file
if (err != FR_OK && err != FR_EXIST) {
unlockSpi();
printError("Card mounted...\r\nCan't create Log file, check your SD.\r\nFS mount failed", err); // else - show error
return;
}
err = f_lseek(&FDLogFile, f_size(&FDLogFile)); // Move to end of the file to append data
if (err) {
unlockSpi();
printError("Seek error", err);
return;
}
f_sync(&FDLogFile);
fs_ready = true; // everything Ok
unlockSpi();
}
static void ff_cmd_dir(char *path) {
DIR dir;
FILINFO fno;
char *fn;
if (!fs_ready) {
scheduleMsg(&logger, "Error: No File system is mounted");
return;
}
FRESULT res = f_opendir(&dir, path);
if (res != FR_OK) {
scheduleMsg(&logger, "Error opening directory %s", path);
return;
}
int i = strlen(path);
for (;;) {
res = f_readdir(&dir, &fno);
if (res != FR_OK || fno.fname[0] == 0)
break;
if (fno.lfname[0] == '.')
continue;
fn = fno.lfname;
if (fno.fattrib & AM_DIR) {
// TODO: WHAT? WE ARE APPENDING FILE NAME TO PARAMETER??? WEIRD!!!
path[i++] = '/';
strcpy(&path[i], fn);
// res = ff_cmd_ls(path);
if (res != FR_OK)
break;
path[i] = 0;
} else {
scheduleMsg(&logger, "%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %-12s", (fno.fattrib & AM_DIR) ? 'D' : '-',
(fno.fattrib & AM_RDO) ? 'R' : '-', (fno.fattrib & AM_HID) ? 'H' : '-',
(fno.fattrib & AM_SYS) ? 'S' : '-', (fno.fattrib & AM_ARC) ? 'A' : '-', (fno.fdate >> 9) + 1980,
(fno.fdate >> 5) & 15, fno.fdate & 31, (fno.ftime >> 11), (fno.ftime >> 5) & 63, fno.fsize,
fno.fname);
}
}
}
static int errorReported = FALSE; // this is used to report the error only once
/**
* @brief Appends specified line to the current log file
*/
void appendToLog(char *line) {
UINT bytesWrited;
if (!fs_ready) {
if (!errorReported)
scheduleMsg(&logger, "appendToLog Error: No File system is mounted");
errorReported = TRUE;
return;
}
UINT lineLength = strlen(line);
totalLoggedBytes += lineLength;
lockSpi(SPI_NONE);
FRESULT err = f_write(&FDLogFile, line, lineLength, &bytesWrited);
if (bytesWrited < lineLength) {
printError("write error or disk full", err); // error or disk full
}
f_sync(&FDLogFile);
unlockSpi();
}
/*
* MMC card umount.
*/
static void MMCumount(void) {
if (!fs_ready) {
scheduleMsg(&logger, "Error: No File system is mounted. \"mountsd\" first");
return;
}
f_close(&FDLogFile); // close file
f_sync(&FDLogFile); // sync ALL
mmcDisconnect(&MMCD1); // Brings the driver in a state safe for card removal.
mmcStop(&MMCD1); // Disables the MMC peripheral.
f_mount(0, NULL); // FATFS: Unregister work area prior to discard it
memset(&FDLogFile, 0, sizeof(FIL)); // clear FDLogFile
fs_ready = false; // status = false
scheduleMsg(&logger, "MMC/SD card removed");
}
/*
* MMC card mount.
*/
static void MMCmount(void) {
// printMmcPinout();
if (fs_ready) {
scheduleMsg(&logger, "Error: Already mounted. \"umountsd\" first");
return;
}
// start to initialize MMC/SD
mmcObjectInit(&MMCD1); // Initializes an instance.
mmcStart(&MMCD1, &mmccfg); // Configures and activates the MMC peripheral.
// Performs the initialization procedure on the inserted card.
lockSpi(SPI_NONE);
if (mmcConnect(&MMCD1) != CH_SUCCESS) {
warning(OBD_PCM_Processor_Fault, "Can't connect or mount MMC/SD");
unlockSpi();
return;
}
unlockSpi();
// if Ok - mount FS now
memset(&MMC_FS, 0, sizeof(FATFS)); // reserve the memory
if (f_mount(0, &MMC_FS) == FR_OK) {
createLogFile();
scheduleMsg(&logger, "MMC/SD mounted!\r\nDon't forget umountsd before remove to prevent lost your data");
}
}
#if defined __GNUC__
__attribute__((noreturn)) static msg_t MMCmonThread(void)
#else
static msg_t MMCmonThread(void)
#endif
{
chRegSetThreadName("MMC_Monitor");
while (true) {
// this returns TRUE if SD module is there, even without an SD card?
if (blkIsInserted(&MMCD1)) {
if (!fs_ready) {
MMCmount();
}
}
// this thread is activated 10 times per second
chThdSleepMilliseconds(PUSHPULLDELAY);
}
}
bool isSdCardAlive(void) {
return fs_ready;
}
void initMmcCard(void) {
initLogging(&logger, "mmcCard");
if (!boardConfiguration->isSdCardEnabled) {
return;
}
/**
* FYI: SPI does not work with CCM memory, be sure to have main() stack in RAM, not in CCMRAM
*/
// start to initialize MMC/SD
mmcObjectInit(&MMCD1);
mmcStart(&MMCD1, &mmccfg);
chThdCreateStatic(tp_MMC_Monitor, sizeof(tp_MMC_Monitor), LOWPRIO, (tfunc_t) MMCmonThread, NULL);
addConsoleAction("sdstat", sdStatistics);
addConsoleAction("mountsd", MMCmount);
addConsoleActionS("appendToLog", appendToLog);
addConsoleAction("umountsd", MMCumount);
addConsoleActionS("ls", ff_cmd_dir);
}
#endif /* EFI_FILE_LOGGING */

8
java_console/ui/src/com/rusefi/EcuStimulator.java
View File

@ -63,11 +63,13 @@ public class EcuStimulator {
private final JPanel content = new JPanel(new BorderLayout());
private JPanel panel = ChartHelper.create3DControl(data, model, TITLE);
private static EcuStimulator instance = new EcuStimulator();
private final JLabel statusLabel = new JLabel();
private EcuStimulator() {
JPanel panel = ChartHelper.create3DControl(data, model, TITLE);
content.add(statusLabel, BorderLayout.NORTH);
content.add(panel, BorderLayout.CENTER);
content.add(inputs.getContent(), BorderLayout.WEST);
}
@ -143,6 +145,8 @@ public class EcuStimulator {
*/
sleepRuntime(SLEEP_TIME);
statusLabel.setText("RPM " + rpm + ", el " + engineLoad);
/**
* We are making a number of measurements and then we take the middle one
*/

2
java_console/ui/src/com/rusefi/StimulationInputs.java
View File

@ -52,7 +52,7 @@ public class StimulationInputs {
}
public double getEngineLoadR2Resistance() {
return (double) elResistance2.getValue();
return (Integer) elResistance2.getValue();
}
}

21
java_console/ui/src/com/rusefi/test/VoltageDividerTest.java Normal file
View File

@ -0,0 +1,21 @@
package com.rusefi.test;
import com.rusefi.StimulationInputs;
import com.rusefi.ui.widgets.PotCommand;
import junit.framework.TestCase;
import org.junit.Test;
public class VoltageDividerTest extends TestCase {
@Test
public void testR1() {
assertEquals(2000.0, PotCommand.getR1InVoltageDivider3(1, 5, 10000));
assertEquals(2040.816326530612, PotCommand.getR1InVoltageDivider3(1, 4.9, 10000));
}
}

1
java_console/ui/src/com/rusefi/ui/ChartHelper.java
View File

@ -26,6 +26,7 @@ public class ChartHelper {
public static JPanel create3DControl(final XYData data, SurfaceModel surfaceModel, String title) {
JPanel result = new JPanel(new BorderLayout());
result.setBorder(BorderFactory.createLineBorder(Color.red));
final JSurfacePanel jsp = new JSurfacePanel(surfaceModel);
jsp.setTitleText(title);

10
java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java
View File

@ -83,11 +83,11 @@ public class PotCommand {
public static void requestPotChange(int channel, int resistance) {
if (resistance < 0 || resistance > 10000)
throw new IllegalArgumentException("resistance: " + resistance);
CommandQueue.getInstance().write("pot" + channel + " " + resistance);
CommandQueue.getInstance().write("pot " + channel + " " + resistance);
}
public static int getPotResistance(Double vout, double vRef) {
double r = getR1InVoltageDividor3(vout, vRef, EcuStimulator.getInstance().getInputs().getEngineLoadR2Resistance());
public static int getPotResistance(double vout, double vRef) {
double r = getR1InVoltageDivider3(vout, vRef, EcuStimulator.getInstance().getInputs().getEngineLoadR2Resistance());
MessagesCentral.getInstance().postMessage(PotCommand.class, "VRef=" + vRef + ", needed resistance: " + r);
// pot command accept resistance and does the conversion itself
return (int) r;
@ -101,8 +101,8 @@ public class PotCommand {
// return (int) (256 - (Rwa - 52) * 256 / 10000);
// }
private static double getR1InVoltageDividor3(double Vout, double Vin, double r2) {
return r2 * Vin / Vout - r2;
public static double getR1InVoltageDivider3(double Vout, double Vin, double r2) {
return r2 * Vout / Vin;
}
}