Skip to content

[修复]修复路径问题、新版本兼容问题、临界区等 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeenter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[修复]修复路径问题、新版本兼容问题、临界区等 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if GetDepend('PKG_USING_DS18B20_SAMPLE'):
src += Glob('sample/ds18b20_sample.c')

# add ds18b20 include path.
path = [cwd + '/inc']
path = [cwd + '/inc'] + [cwd + '/../../rt-thread/components/drivers/include/drivers']

# add src and include to group.
group = DefineGroup('ds18b20', src, depend = ['PKG_USING_DS18B20'], CPPPATH = path)
Expand Down
10 changes: 7 additions & 3 deletions src/sensor_dallas_ds18b20.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define SENSOR_TEMP_RANGE_MAX (125)
#define SENSOR_TEMP_RANGE_MIN (-55)

RT_WEAK void rt_hw_us_delay(rt_uint32_t us)
rt_weak void rt_hw_us_delay(rt_uint32_t us)
{
rt_uint32_t delta;

Expand Down Expand Up @@ -94,11 +94,13 @@ static uint8_t ds18b20_read_byte(rt_base_t pin)
uint8_t i, j, dat;
dat = 0;

rt_enter_critical();
for (i = 1; i <= 8; i++)
{
j = ds18b20_read_bit(pin);
dat = (j << 7) | (dat >> 1);
}
rt_exit_critical();

return dat;
}
Expand All @@ -109,6 +111,7 @@ static void ds18b20_write_byte(rt_base_t pin, uint8_t dat)
uint8_t testb;
rt_pin_mode(pin, PIN_MODE_OUTPUT);

rt_enter_critical();
for (j = 1; j <= 8; j++)
{
testb = dat & 0x01;
Expand All @@ -129,6 +132,7 @@ static void ds18b20_write_byte(rt_base_t pin, uint8_t dat)
rt_hw_us_delay(2);
}
}
rt_exit_critical();
}

void ds18b20_start(rt_base_t pin)
Expand Down Expand Up @@ -167,15 +171,15 @@ int32_t ds18b20_get_temperature(rt_base_t pin)
tem = TH;
tem <<= 8;
tem += TL;
tem = (int32_t)(tem * 0.0625 * 10 + 0.5);
tem = (int32_t)(tem * 0.0625 * 10 + 0.5);//10倍温度，+0.5实现四舍五入
return -tem;
}
else
{
tem = TH;
tem <<= 8;
tem += TL;
tem = (int32_t)(tem * 0.0625 * 10 + 0.5);
tem = (int32_t)(tem * 0.0625 * 10 + 0.5);//10倍温度，+0.5实现四舍五入
return tem;
}
}
Expand Down