thomas
/
marlin
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

Fix power calculations 

As suggested by @max-pau in #3073 - #3074
Scott Lahteine 9 lat temu
rodzic
e2b022cce2
commit
13ef12ad3f
19 zmienionych plików z 38 dodań i 38 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 2
    2
      Marlin/Configuration.h
  2. 2
    2
      Marlin/example_configurations/Felix/Configuration.h
  3. 2
    2
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  4. 2
    2
      Marlin/example_configurations/Hephestos/Configuration.h
  5. 2
    2
      Marlin/example_configurations/Hephestos_2/Configuration.h
  6. 2
    2
      Marlin/example_configurations/K8200/Configuration.h
  7. 2
    2
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  8. 2
    2
      Marlin/example_configurations/RigidBot/Configuration.h
  9. 2
    2
      Marlin/example_configurations/SCARA/Configuration.h
  10. 2
    2
      Marlin/example_configurations/TAZ4/Configuration.h
  11. 2
    2
      Marlin/example_configurations/WITBOX/Configuration.h
  12. 2
    2
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  13. 2
    2
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  14. 2
    2
      Marlin/example_configurations/delta/generic/Configuration.h
  15. 2
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  16. 2
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  17. 2
    2
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  18. 2
    2
      Marlin/example_configurations/makibox/Configuration.h
  19. 2
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 2
- 2
Marlin/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/Felix/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_DUAL.h Wyświetl plik

168 
 #define BED_MAXTEMP 150
 168 
 #define BED_MAXTEMP 150
169
169
170 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 170 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
171 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
172 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
171 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
172 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
173
173
174 
 //===========================================================================
 174 
 //===========================================================================
175 
 //============================= PID Settings ================================
 175 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/Hephestos/Configuration.h Wyświetl plik

182 
 #define BED_MAXTEMP 150
 182 
 #define BED_MAXTEMP 150
183
183
184 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 184 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
185 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
186 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
185 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
186 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
187
187
188 
 //===========================================================================
 188 
 //===========================================================================
189 
 //============================= PID Settings ================================
 189 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/Hephestos_2/Configuration.h Wyświetl plik

180 
 #define BED_MAXTEMP 150
 180 
 #define BED_MAXTEMP 150
181
181
182 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 182 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
183 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
184 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
183 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
184 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
185
185
186 
 //===========================================================================
 186 
 //===========================================================================
187 
 //============================= PID Settings ================================
 187 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/K8200/Configuration.h Wyświetl plik

184 
 #define BED_MAXTEMP 150
 184 
 #define BED_MAXTEMP 150
185
185
186 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 186 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
187 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
188 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
187 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
188 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
189
189
190 
 //===========================================================================
 190 
 //===========================================================================
191 
 //============================= PID Settings ================================
 191 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration.h Wyświetl plik

204 
 #define BED_MAXTEMP 150
 204 
 #define BED_MAXTEMP 150
205
205
206 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 206 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
207 
-#define EXTRUDER_WATTS (2*2/5.9) //  P=I^2/R
208 
-#define BED_WATTS (5.45*5.45/2.2)      // P=I^2/R
207 
+#define EXTRUDER_WATTS (2*2/5.9)       // P=U^2/R
208 
+#define BED_WATTS (5.45*5.45/2.2)      // P=U^2/R
209
209
210 
 //===========================================================================
 210 
 //===========================================================================
211 
 //============================= PID Settings ================================
 211 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/TAZ4/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/WITBOX/Configuration.h Wyświetl plik

182 
 #define BED_MAXTEMP 150
 182 
 #define BED_MAXTEMP 150
183
183
184 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 184 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
185 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
186 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
185 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
186 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
187
187
188 
 //===========================================================================
 188 
 //===========================================================================
189 
 //============================= PID Settings ================================
 189 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/adafruit/ST7565/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/delta/biv2.5/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration.h Wyświetl plik

183 
 #define BED_MAXTEMP 150
 183 
 #define BED_MAXTEMP 150
184
184
185 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 185 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
186 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
187 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
186 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
187 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
188
188
189 
 //===========================================================================
 189 
 //===========================================================================
190 
 //============================= PID Settings ================================
 190 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration.h Wyświetl plik

202 
 #define BED_MAXTEMP 150
 202 
 #define BED_MAXTEMP 150
203
203
204 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 204 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
205 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
206 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
205 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
206 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
207
207
208 
 //===========================================================================
 208 
 //===========================================================================
209 
 //============================= PID Settings ================================
 209 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/makibox/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration.h Wyświetl plik

179 
 #define BED_MAXTEMP 150
 179 
 #define BED_MAXTEMP 150
180
180
181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
 181 
 // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
182 
-//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
183 
-//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
182 
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=U^2/R
183 
+//#define BED_WATTS (12.0*12.0/1.1)      // P=U^2/R
184
184
185 
 //===========================================================================
 185 
 //===========================================================================
186 
 //============================= PID Settings ================================
 186 
 //============================= PID Settings ================================

Napisz Podgląd
Ładowanie…
Anuluj
Zapisz