浏览代码

Fix MAX6675 readout with Hardware SPI (#13530)

Kajetan Rzepecki 6 年前
父节点
当前提交
c9079165ee
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5
    1
      Marlin/src/module/temperature.cpp

+ 5
- 1
Marlin/src/module/temperature.cpp 查看文件

1816
     //
1816
     //
1817
     // TODO: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
1817
     // TODO: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
1818
     //
1818
     //
1819
-    #if MAX6675_SEPARATE_SPI
1819
+    #if !MAX6675_SEPARATE_SPI
1820
       spiBegin();
1820
       spiBegin();
1821
       spiInit(MAX6675_SPEED_BITS);
1821
       spiInit(MAX6675_SPEED_BITS);
1822
     #endif
1822
     #endif
1823
 
1823
 
1824
     #if COUNT_6675 > 1
1824
     #if COUNT_6675 > 1
1825
       #define WRITE_MAX6675(V) do{ switch (hindex) { case 1: WRITE(MAX6675_SS2_PIN, V); break; default: WRITE(MAX6675_SS_PIN, V); } }while(0)
1825
       #define WRITE_MAX6675(V) do{ switch (hindex) { case 1: WRITE(MAX6675_SS2_PIN, V); break; default: WRITE(MAX6675_SS_PIN, V); } }while(0)
1826
+      #define SET_OUTPUT_MAX6675() do{ switch (hindex) { case 1: SET_OUTPUT(MAX6675_SS2_PIN); break; default: SET_OUTPUT(MAX6675_SS_PIN); } }while(0)
1826
     #elif ENABLED(HEATER_1_USES_MAX6675)
1827
     #elif ENABLED(HEATER_1_USES_MAX6675)
1827
       #define WRITE_MAX6675(V) WRITE(MAX6675_SS2_PIN, V)
1828
       #define WRITE_MAX6675(V) WRITE(MAX6675_SS2_PIN, V)
1829
+      #define SET_OUTPUT_MAX6675() SET_OUTPUT(MAX6675_SS2_PIN)
1828
     #else
1830
     #else
1829
       #define WRITE_MAX6675(V) WRITE(MAX6675_SS_PIN, V)
1831
       #define WRITE_MAX6675(V) WRITE(MAX6675_SS_PIN, V)
1832
+      #define SET_OUTPUT_MAX6675() SET_OUTPUT(MAX6675_SS_PIN)
1830
     #endif
1833
     #endif
1831
 
1834
 
1835
+    SET_OUTPUT_MAX6675();
1832
     WRITE_MAX6675(LOW);  // enable TT_MAX6675
1836
     WRITE_MAX6675(LOW);  // enable TT_MAX6675
1833
 
1837
 
1834
     DELAY_NS(100);       // Ensure 100ns delay
1838
     DELAY_NS(100);       // Ensure 100ns delay

正在加载...
取消
保存