-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4282 from shellixyz/temp_sensors_improvements
Temp sensors improvements
- Loading branch information
Showing
35 changed files
with
1,589 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
|
|
||
| #include <string.h> | ||
|
|
||
| #include "drivers/1-wire.h" | ||
| #include "drivers/1-wire/ds2482.h" | ||
|
|
||
| #include "drivers/logging.h" | ||
|
|
||
|
|
||
| #ifdef USE_1WIRE | ||
|
|
||
| #ifdef USE_1WIRE_DS2482 | ||
| static bool ds2482Detected = false; | ||
| static owDev_t ds2482Dev; | ||
| #endif | ||
|
|
||
| void owInit(void) | ||
| { | ||
| memset(&ds2482Dev, 0, sizeof(ds2482Dev)); | ||
| addBootlogEvent2(BOOT_EVENT_TEMP_SENSOR_DETECTION, BOOT_EVENT_FLAGS_NONE); | ||
| #ifdef USE_1WIRE_DS2482 | ||
| if (ds2482Detect(&ds2482Dev)) ds2482Detected = true; | ||
| #endif | ||
| } | ||
|
|
||
| owDev_t *getOwDev(void) | ||
| { | ||
| return ds2482Detected ? &ds2482Dev : NULL; | ||
| } | ||
|
|
||
| #endif /* USE_1WIRE */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "drivers/bus.h" | ||
|
|
||
| #ifdef USE_1WIRE | ||
|
|
||
| #define OW_STATUS_1WB_POS 0 // 1-Wire busy | ||
| #define OW_STATUS_PPD_POS 1 // Presense-pulse detect | ||
| #define OW_STATUS_SD_POS 2 // Short detected | ||
| #define OW_STATUS_LL_POS 3 // Logic level | ||
| #define OW_STATUS_RST_POS 4 // Device reset | ||
| #define OW_STATUS_SBR_POS 5 // Single bit result | ||
| #define OW_STATUS_TSB_POS 6 // Triplet second bit | ||
| #define OW_STATUS_DIR_POS 7 // Branch direction taken | ||
|
|
||
| #define OW_BUS_BUSY(status) (status & (1 << OW_STATUS_1WB_POS)) | ||
| #define OW_DEVICE_PRESENT(status) (status & (1 << OW_STATUS_PPD_POS)) // True if a device have been detected on the bus after a bus reset | ||
| #define OW_RESET(status) (status & (1 << OW_STATUS_RST_POS)) | ||
| #define OW_LOGIC_LEVEL(status) (status & (1 << OW_STATUS_LL_POS)) | ||
| #define OW_SHORT_DETECTED(status) (status & (1 << OW_STATUS_SD_POS)) | ||
| #define OW_SBR_VALUE(status) ((status >> OW_STATUS_SBR_POS) & 1) // Extract single bit read value or triplet first bit from status register value | ||
| #define OW_TSB_VALUE(status) ((status >> OW_STATUS_TSB_POS) & 1) // Extract triplet second bit value from status register value | ||
| #define OW_DIR_VALUE(status) ((status >> OW_STATUS_DIR_POS) & 1) // Extract triplet chosen direction bit value from status register value | ||
|
|
||
| #define OW_TRIPLET_FIRST_BIT(tripletResult) (tripletResult & (1 << 0)) | ||
| #define OW_TRIPLET_SECOND_BIT(tripletResult) (tripletResult & (1 << 1)) | ||
| #define OW_TRIPLET_DIRECTION_BIT(tripletResult) (tripletResult & (1 << 2)) | ||
|
|
||
| #define OW_SINGLE_BIT_WRITE0 0 | ||
| #define OW_SINGLE_BIT_WRITE1_READ (1<<7) | ||
|
|
||
| typedef struct owDev_s { | ||
| busDevice_t *busDev; | ||
|
|
||
| uint8_t status; | ||
|
|
||
| bool (*reset)(struct owDev_s *owDev); | ||
| bool (*owResetCommand)(struct owDev_s *owDev); | ||
| bool (*owReset)(struct owDev_s *owDev); | ||
| bool (*waitForBus)(struct owDev_s *owDev); | ||
| bool (*readConfig)(struct owDev_s *owDev, uint8_t *config); | ||
| bool (*writeConfig)(struct owDev_s *owDev, uint8_t config); | ||
| bool (*readStatus)(struct owDev_s *owDev, uint8_t *status); | ||
| uint8_t (*getStatus)(struct owDev_s *owDev); | ||
| bool (*poll)(struct owDev_s *owDev, bool waitForBus, uint8_t *status); | ||
| bool (*owBusReady)(struct owDev_s *owDev); | ||
|
|
||
| // 1-Wire ROM | ||
| bool (*owSearchRom)(struct owDev_s *owDev, uint8_t familyCode, uint64_t *romTable, uint8_t *romTableLen); | ||
| bool (*owMatchRomCommand)(struct owDev_s *owDev); | ||
| bool (*owMatchRom)(struct owDev_s *owDev, uint64_t rom); | ||
| bool (*owSkipRomCommand)(struct owDev_s *owDev); | ||
| bool (*owSkipRom)(struct owDev_s *owDev); | ||
|
|
||
| // 1-Wire read/write | ||
| bool (*owWriteByteCommand)(struct owDev_s *owDev, uint8_t byte); | ||
| bool (*owWriteByte)(struct owDev_s *owDev, uint8_t byte); | ||
| bool (*owWriteBuf)(struct owDev_s *owDev, const uint8_t *buf, uint8_t len); | ||
| bool (*owReadByteCommand)(struct owDev_s *owDev); | ||
| bool (*owReadByteResult)(struct owDev_s *owDev, uint8_t *result); | ||
| bool (*owReadByte)(struct owDev_s *owDev, uint8_t *result); | ||
| bool (*owReadBuf)(struct owDev_s *owDev, uint8_t *buf, uint8_t len); | ||
| bool (*owSingleBitCommand)(struct owDev_s *owDev, uint8_t type); | ||
| bool (*owSingleBitResult)(struct owDev_s *owDev); | ||
| bool (*owSingleBit)(struct owDev_s *owDev, uint8_t type, bool *result); | ||
| bool (*owTripletCommand)(struct owDev_s *owDev, uint8_t direction); | ||
| uint8_t (*owTripletResult)(struct owDev_s *owDev); | ||
| bool (*owTriplet)(struct owDev_s *owDev, uint8_t direction, uint8_t *result); | ||
| } owDev_t; | ||
|
|
||
| void owInit(void); | ||
| owDev_t *getOwDev(void); | ||
|
|
||
| #endif /* defined(USE_1WIRE) && defined(USE_1WIRE_DS2482) */ |
Oops, something went wrong.