Merge remote-tracking branch 'origin/master'

2019-07-24 10:08:30 +02:00
parent 3789d9ec2f 4a863d00a9
commit 762fc075af
2 changed files with 27 additions and 15 deletions
@@ -2,7 +2,7 @@ import Klassen as k

 konstante_eins = k.Groesse(None, None, True, 1)

-Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False),
+Formeln = [k.Formel('Kraftformel', "F=m*a", i=k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False),
                    b=k.Groesse('a', 'm/s²', False), c=konstante_eins, z=konstante_eins,
                    y=konstante_eins, x=konstante_eins),
           k.Formel('Gleichm. beschl. Bew.', i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5),