Merge branch 'flutter' into fix-sensor-interactions

Irfan-del-droid · web-flow · commit f4936a73adcc · 2026-03-29T22:13:52.000+05:30
diff --git a/assets/icons/ic_sawtooth.png b/assets/icons/ic_sawtooth.png
diff --git a/lib/communication/science_lab.dart b/lib/communication/science_lab.dart
@@ -346,6 +346,7 @@ class ScienceLab {
 
   Future<void> loadEquation(String channel, String function) async {
     List<double> span = List.filled(2, 0);
+
     if (function == 'sine') {
       span[0] = 0;
       span[1] = 2 * pi;
@@ -354,21 +355,31 @@ class ScienceLab {
       span[0] = 0;
       span[1] = 4;
       waveType[channel] = 'tria';
+    } else if (function == 'sawtooth') {
+      span[0] = 0;
+      span[1] = 2 * pi;
+      waveType[channel] = 'sawtooth';
     } else {
       waveType[channel] = 'orbit';
     }
+
     double factor = (span[1] - span[0]) / 512;
     List<double> x = [];
     List<double> y = [];
+
     for (int i = 0; i < 512; i++) {
       x.add(span[0] + i * factor);
+
       switch (function) {
         case 'sine':
           y.add(sin(x[i]));
           break;
         case 'tria':
           y.add((x[i] % 4 - 2).abs());
           break;
+        case 'sawtooth':
+          y.add((x[i] / pi) - 1.0);
+          break;
         default:
           break;
       }
@@ -1082,12 +1093,12 @@ class ScienceLab {
     }
 
     if (waveType != null) {
-      if (waveType == "sine" || waveType == "tria") {
+      if (waveType == "sine" || waveType == "tria" || waveType == "sawtooth") {
         if (this.waveType["SI1"] != waveType) {
           loadEquation("SI1", waveType);
         }
       } else {
-        logger.e("Not a valid waveform. try sine or tria");
+        logger.e("Not a valid waveform. try sine, tria, or sawtooth");
       }
     }
 
@@ -1139,12 +1150,12 @@ class ScienceLab {
     }
 
     if (waveType != null) {
-      if (waveType == "sine" || waveType == "tria") {
+      if (waveType == "sine" || waveType == "tria" || waveType == "sawtooth") {
         if (this.waveType["SI2"] != waveType) {
           loadEquation("SI2", waveType);
         }
       } else {
-        logger.e("Not a valid waveform. try sine or tria");
+        logger.e("Not a valid waveform. try sine, tria, or sawtooth");
       }
     }
 
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -664,5 +664,6 @@
     "pin_cap_desc": "Capacitance Measurement Pin",
     "pin_res_name": "RES",
     "pin_res_desc": "Resistance Measurement Pin",
-    "stopSound" : "Stop Sound"
+    "stopSound" : "Stop Sound",
+    "saw" : "Saw"
 }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -4109,6 +4109,12 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Stop Sound'**
   String get stopSound;
+
+  /// No description provided for @saw.
+  ///
+  /// In en, this message translates to:
+  /// **'Saw'**
+  String get saw;
 }
 
 class _AppLocalizationsDelegate
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsEs extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_he.dart b/lib/l10n/app_localizations_he.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsHe extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_hi.dart b/lib/l10n/app_localizations_hi.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_id.dart b/lib/l10n/app_localizations_id.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsIt extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_ml.dart b/lib/l10n/app_localizations_ml.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsMl extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_my.dart b/lib/l10n/app_localizations_my.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsMy extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_nb.dart b/lib/l10n/app_localizations_nb.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsNb extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
@@ -2158,6 +2158,9 @@ class AppLocalizationsPt extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
 
 /// The translations for Portuguese, as used in Brazil (`pt_BR`).
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_te.dart b/lib/l10n/app_localizations_te.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsTe extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsUk extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_vi.dart b/lib/l10n/app_localizations_vi.dart
@@ -2158,4 +2158,7 @@ class AppLocalizationsVi extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
@@ -2158,6 +2158,9 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get stopSound => 'Stop Sound';
+
+  @override
+  String get saw => 'Saw';
 }
 
 /// The translations for Chinese, using the Han script (`zh_Hant`).
diff --git a/lib/providers/wave_generator_state_provider.dart b/lib/providers/wave_generator_state_provider.dart
@@ -28,7 +28,8 @@ enum WaveConst {
   sine,
   triangular,
   square,
-  pwm
+  pwm,
+  sawtooth
 }
 
 enum WaveData {
@@ -50,6 +51,7 @@ class WaveGeneratorStateProvider extends ChangeNotifier {
   static final int sin = 1;
   static final int triangular = 2;
   static final int pwm = 3;
+  static final int sawtooth = 4;
 
   late WaveConst? selectedAnalogWave;
 
@@ -196,13 +198,14 @@ class WaveGeneratorStateProvider extends ChangeNotifier {
         buffer[i] = (_audioAngle < (2 * math.pi * duty)) ? volume : -volume;
       } else {
         double safeSin = math.sin(_audioAngle).clamp(-1.0, 1.0);
-
         double sample = safeSin;
+        int currentWaveType = waveGeneratorConstants
+            .wave[selectedAnalogWave]![WaveConst.waveType]!;
 
-        if (waveGeneratorConstants
-                .wave[selectedAnalogWave]![WaveConst.waveType] ==
-            triangular) {
+        if (currentWaveType == triangular) {
           sample = (2 / math.pi) * math.asin(safeSin);
+        } else if (currentWaveType == sawtooth) {
+          sample = (_audioAngle / math.pi) - 1.0;
         }
 
         buffer[i] = sample * volume;
@@ -318,16 +321,15 @@ class WaveGeneratorStateProvider extends ChangeNotifier {
         .wave[WaveConst.wave2]![WaveConst.phase]!
         .toDouble();
 
+    int shape1 =
+        waveGeneratorConstants.wave[WaveConst.wave1]![WaveConst.waveType]!;
+    int shape2 =
+        waveGeneratorConstants.wave[WaveConst.wave2]![WaveConst.waveType]!;
+
     String waveType1 =
-        waveGeneratorConstants.wave[WaveConst.wave1]![WaveConst.waveType]! ==
-                sin
-            ? "sine"
-            : "tria";
+        shape1 == sin ? "sine" : (shape1 == triangular ? "tria" : "sawtooth");
     String waveType2 =
-        waveGeneratorConstants.wave[WaveConst.wave2]![WaveConst.waveType]! ==
-                sin
-            ? "sine"
-            : "tria";
+        shape2 == sin ? "sine" : (shape2 == triangular ? "tria" : "sawtooth");
 
     if (_scienceLab.isConnected()) {
       if (waveGeneratorConstants.modeSelected == WaveConst.square) {
@@ -486,18 +488,25 @@ class WaveGeneratorStateProvider extends ChangeNotifier {
         phase = waveGeneratorConstants.wave[WaveConst.wave2]![WaveConst.phase]!
             .toDouble();
       }
-      if (shape == 1) {
+
+      if (shape == sin) {
         for (int i = 0; i < 5000; i++) {
           double y = 5 * math.sin(2 * pi * (freq / 1e6) * i + phase * pi / 180);
           entries.add(FlSpot(i.toDouble(), y));
         }
-      } else {
+      } else if (shape == triangular) {
         for (int i = 0; i < 5000; i++) {
           double y = (10 / pi) *
               (math.asin(
                   math.sin(2 * pi * (freq / 1e6) * i + phase * pi / 180)));
           entries.add(FlSpot(i.toDouble(), y));
         }
+      } else if (shape == sawtooth) {
+        for (int i = 0; i < 5000; i++) {
+          double t = 2 * pi * (freq / 1e6) * i + phase * pi / 180;
+          double y = 5 * (((t % (2 * pi)) / pi) - 1.0);
+          entries.add(FlSpot(i.toDouble(), y));
+        }
       }
     }
     return entries;
@@ -548,6 +557,16 @@ class WaveGeneratorStateProvider extends ChangeNotifier {
         return WaveConst.phase;
       case 'duty':
         return WaveConst.duty;
+      case 'sine':
+        return WaveConst.sine;
+      case 'triangular':
+        return WaveConst.triangular;
+      case 'square':
+        return WaveConst.square;
+      case 'pwm':
+        return WaveConst.pwm;
+      case 'sawtooth':
+        return WaveConst.sawtooth;
       default:
         return WaveConst.wave1;
     }
diff --git a/lib/view/widgets/analog_waveform_controls.dart b/lib/view/widgets/analog_waveform_controls.dart
diff --git a/lib/view/widgets/wave_generator_main_controls.dart b/lib/view/widgets/wave_generator_main_controls.dart

Original file line number	Diff line number	Diff line change
`@@ -664,5 +664,6 @@`
`664`	`664`	`"pin_cap_desc": "Capacitance Measurement Pin",`
`665`	`665`	`"pin_res_name": "RES",`
`666`	`666`	`"pin_res_desc": "Resistance Measurement Pin",`
`667`		`- "stopSound" : "Stop Sound"`
	`667`	`+ "stopSound" : "Stop Sound",`
	`668`	`+ "saw" : "Saw"`
`668`	`669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2158,4 +2158,7 @@ class AppLocalizationsDe extends AppLocalizations {`
`2158`	`2158`
`2159`	`2159`	`@override`
`2160`	`2160`	`String get stopSound => 'Stop Sound';`
	`2161`	`+`
	`2162`	`+ @override`
	`2163`	`+ String get saw => 'Saw';`
`2161`	`2164`	`}`