Skip to content

Commit 6b9835d

Browse files
committed
v3.6
1 parent f189157 commit 6b9835d

21 files changed

+1711
-1687
lines changed

README.md

Lines changed: 176 additions & 135 deletions
Large diffs are not rendered by default.

Software/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ build_flags =
2727
#-DIS_ACAR_DISPLAY ;changes the month output to 2 numbers, per the original A Car display
2828
#-DGTE_KEYPAD ;keypad mapping for real GTE/TRW keypad control board
2929
-DTC_HAVESPEEDO ;enables speedo control via i2c - HT16K33-based
30-
#-DSP_CS_0ON ;enable the fake-0 on CircuitSetup's speedo
3130
-DTC_HAVEGPS ;enables support for a speedo with GPS
3231
-DTC_HAVELIGHT ;enables support for a light sensor via i2c - TLS2561, BH1750
3332
-DTC_HAVETEMP ;support of a temperature/humidity sensor (MCP9808, BMx280, SI7021, SHT40, TMP117, AHT20, HTU31D) connected via i2c

Software/src/speeddisplay.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ bool speedDisplay::begin(int dispType)
388388
clearDisplay(); // clear display RAM
389389
on(); // turn it on
390390

391+
thirdDig = (_dispType == SP_CIRCSETUP);
392+
391393
return true;
392394
}
393395

@@ -594,12 +596,13 @@ void speedDisplay::setSpeed(int8_t speedNum)
594596
}
595597
b1 = *(_fontXSeg + b1);
596598
b2 = *(_fontXSeg + b2);
597-
#ifdef SP_CS_0ON
598-
if(_dispType == SP_CIRCSETUP) {
599+
600+
// CircuitSetup Speedo: Enable/disable third digit
601+
if(thirdDig) {
599602
// Hack to display "0" after dot
600603
_displayBuffer[2] = b3;
601604
}
602-
#endif
605+
603606

604607
if(dispL0Spd || speedNum > 9 /*|| b1 == 37*/) _displayBuffer[_speed_pos10] |= (b1 << _dig10_shift);
605608
_displayBuffer[_speed_pos01] |= (b2 << _dig01_shift);

Software/src/speeddisplay.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class speedDisplay {
135135
bool getColon() { return _colon; }
136136

137137
bool dispL0Spd = true;
138+
bool thirdDig = false;
138139

139140
private:
140141

Software/src/src/WiFiManager/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2015 tzapu
4+
Adaptions: Copyright (c) Thomas Winischhofer
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)