me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Ben V. Brown
2020-09-17 19:38:40 +10:00
parent adc58ffecf
commit 13a9159470
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workspace/TS100/Core/BSP/Pine64/Pins.h
View File

@@ -13,17 +13,17 @@
#define KEY_B_GPIO_Port GPIOB #define KEY_B_GPIO_Port GPIOB
#define TMP36_INPUT_Pin BIT(4) #define TMP36_INPUT_Pin BIT(4)
#define TMP36_INPUT_GPIO_Port GPIOA #define TMP36_INPUT_GPIO_Port GPIOA
#define TMP36_ADC0_CHANNEL ADC_CHANNEL_4
#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4 #define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
#define TMP36_ADC2_CHANNEL ADC_CHANNEL_4
#define TIP_TEMP_Pin BIT(1) #define TIP_TEMP_Pin BIT(1)
#define TIP_TEMP_GPIO_Port GPIOA #define TIP_TEMP_GPIO_Port GPIOA
#define TIP_TEMP_ADC0_CHANNEL ADC_CHANNEL_1
#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_1 #define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_1
#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_1
#define VIN_Pin BIT(0) #define VIN_Pin BIT(0)
#define VIN_GPIO_Port GPIOA #define VIN_GPIO_Port GPIOA
#define VIN_ADC0_CHANNEL ADC_CHANNEL_0
#define VIN_ADC1_CHANNEL ADC_CHANNEL_0 #define VIN_ADC1_CHANNEL ADC_CHANNEL_0
#define VIN_ADC2_CHANNEL ADC_CHANNEL_0
#define OLED_RESET_Pin BIT(9) #define OLED_RESET_Pin BIT(9)
#define OLED_RESET_GPIO_Port GPIOA #define OLED_RESET_GPIO_Port GPIOA
#define KEY_A_Pin BIT(0) #define KEY_A_Pin BIT(0)

16
workspace/TS100/Core/BSP/Pine64/Setup.c
View File

@@ -146,22 +146,22 @@ void setup_adc() {
adc_channel_length_config(ADC0, ADC_REGULAR_CHANNEL, 2); adc_channel_length_config(ADC0, ADC_REGULAR_CHANNEL, 2);
adc_channel_length_config(ADC1, ADC_REGULAR_CHANNEL, 2); adc_channel_length_config(ADC1, ADC_REGULAR_CHANNEL, 2);
//Setup the two channels //Setup the two channels
adc_regular_channel_config(ADC0, 0, TMP36_ADC1_CHANNEL, adc_regular_channel_config(ADC0, 0, TMP36_ADC0_CHANNEL,
ADC_SAMPLETIME_71POINT5); //temp sensor ADC_SAMPLETIME_71POINT5); //temp sensor
adc_regular_channel_config(ADC1, 0, TMP36_ADC2_CHANNEL, adc_regular_channel_config(ADC1, 0, TMP36_ADC1_CHANNEL,
ADC_SAMPLETIME_71POINT5); //temp sensor ADC_SAMPLETIME_71POINT5); //temp sensor
adc_regular_channel_config(ADC0, 1, VIN_ADC1_CHANNEL, adc_regular_channel_config(ADC0, 1, VIN_ADC0_CHANNEL,
ADC_SAMPLETIME_71POINT5); //DC Input voltage ADC_SAMPLETIME_71POINT5); //DC Input voltage
adc_regular_channel_config(ADC1, 1, VIN_ADC2_CHANNEL, adc_regular_channel_config(ADC1, 1, VIN_ADC1_CHANNEL,
ADC_SAMPLETIME_71POINT5); //DC Input voltage ADC_SAMPLETIME_71POINT5); //DC Input voltage
//Setup that we want all 4 inserted readings to be the tip temp //Setup that we want all 4 inserted readings to be the tip temp
adc_channel_length_config(ADC0, ADC_INSERTED_CHANNEL, 4); adc_channel_length_config(ADC0, ADC_INSERTED_CHANNEL, 4);
adc_channel_length_config(ADC1, ADC_INSERTED_CHANNEL, 4); adc_channel_length_config(ADC1, ADC_INSERTED_CHANNEL, 4);
for (int rank = 0; rank < 4; rank++) { for (int rank = 0; rank < 4; rank++) {
adc_inserted_channel_config(ADC0, rank, TIP_TEMP_ADC1_CHANNEL, adc_inserted_channel_config(ADC0, rank, TIP_TEMP_ADC0_CHANNEL,
ADC_SAMPLETIME_1POINT5); ADC_SAMPLETIME_1POINT5);
adc_inserted_channel_config(ADC1, rank, TIP_TEMP_ADC2_CHANNEL, adc_inserted_channel_config(ADC1, rank, TIP_TEMP_ADC1_CHANNEL,
ADC_SAMPLETIME_1POINT5); ADC_SAMPLETIME_1POINT5);
} }
// Enable triggers for the ADC // Enable triggers for the ADC
adc_external_trigger_config(ADC0, ADC_INSERTED_CHANNEL, ENABLE); adc_external_trigger_config(ADC0, ADC_INSERTED_CHANNEL, ENABLE);

4
workspace/TS100/configuration.h
View File

@@ -101,7 +101,7 @@
#define VOLTAGE_DIV 467 // 467 - Default divider from schematic #define VOLTAGE_DIV 467 // 467 - Default divider from schematic
#define CALIBRATION_OFFSET 900 // 900 - Default adc offset in uV #define CALIBRATION_OFFSET 900 // 900 - Default adc offset in uV
#define PID_POWER_LIMIT 70 // Sets the max pwm power limit #define PID_POWER_LIMIT 70 // Sets the max pwm power limit
#define POWER_LIMIT 30 // 30 watts default limit #define POWER_LIMIT 0 // 0 watts default limit
#define MAX_POWER_LIMIT 65 // #define MAX_POWER_LIMIT 65 //
#define POWER_LIMIT_STEPS 5 // #define POWER_LIMIT_STEPS 5 //
#define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100 #define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100
@@ -111,7 +111,7 @@
#define VOLTAGE_DIV 467 // 467 - Default divider from schematic #define VOLTAGE_DIV 467 // 467 - Default divider from schematic
#define CALIBRATION_OFFSET 900 // 900 - Default adc offset in uV #define CALIBRATION_OFFSET 900 // 900 - Default adc offset in uV
#define PID_POWER_LIMIT 70 // Sets the max pwm power limit #define PID_POWER_LIMIT 70 // Sets the max pwm power limit
#define POWER_LIMIT 30 // 30 watts default limit #define POWER_LIMIT 0 // 0 watts default limit
#define MAX_POWER_LIMIT 65 // #define MAX_POWER_LIMIT 65 //
#define POWER_LIMIT_STEPS 5 // #define POWER_LIMIT_STEPS 5 //
#define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100 #define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100