triffid
commented
13 years ago one commit per item/fix is perfect for me, and actually preferable to one big commit with lots of changes.. I use cherry-pick rather than merge to sort this stuff out, much cleaner result.
I think what you want to do is rename your master to a new branch, then checkout upstream master afresh, then cherry-pick relevant commits into the new master and create your pull requests around that. I'm still on the git learning curve myself as you can probably tell from a lot of the earlier history in the repo ;) I really cannot emphasize how awesome cherry-pick is for avoiding all those noisy merge commits
Hi, more preprocessor hacking! :-)
This gets rid of ANALOG_MASK in the config.h. The analog mask is still used in pretty much the same way, but it's calculated from all sensors of type TT_THERMISTOR or TT_AD595.
Also fixed a small bug in the AD595 code, which didn't even compile because of the temp_pin reference. I only tested the code with a thermistor though. Please test this especially if you have setup with more than one sensor.
Sorry about the mess of commits. Git-wise I did everything by the book as far as I can tell, but I still end up with 5 commits instead of one on Github.