[debie1] reenable printf's and fix several conversion specifiers

debie1/.frama-c/debie1.eva/metrics.log

@@ -14,14 +14,14 @@ Initializer of hit_task references HitTriggerTask (at code/measure.c:544)
 Initializer of TC_task references TelecommandExecutionTask (at code/tc_hand.c:1596)
 [metrics] Statements analyzed by Eva
 --------------------------
-2974 stmts in analyzed functions, 2911 stmts analyzed (97.9%)
-Acquire_Hit: 4 stmts out of 4 (100.0%)
-Acquisition_Tests: 132 stmts out of 132 (100.0%)
-AttachInterrupt: 1 stmts out of 1 (100.0%)
+3241 stmts in analyzed functions, 3170 stmts analyzed (97.8%)
+Acquire_Hit: 10 stmts out of 10 (100.0%)
+Acquisition_Tests: 157 stmts out of 157 (100.0%)
+AttachInterrupt: 2 stmts out of 2 (100.0%)
 Boot: 57 stmts out of 57 (100.0%)
 CalculateChecksum: 21 stmts out of 21 (100.0%)
 CalculateQualityNumber: 28 stmts out of 28 (100.0%)
-Call_Patch: 1 stmts out of 1 (100.0%)
+Call_Patch: 2 stmts out of 2 (100.0%)
 Check_No_Errors: 2 stmts out of 2 (100.0%)
 Check_Nonzero: 4 stmts out of 4 (100.0%)
 Check_Zero: 4 stmts out of 4 (100.0%)
@@ -32,26 +32,26 @@ ClearSoftwareError: 2 stmts out of 2 (100.0%)
 Clear_Errors: 4 stmts out of 4 (100.0%)
 Clear_RTX_Errors: 8 stmts out of 8 (100.0%)
 Clear_SU_Error: 8 stmts out of 8 (100.0%)
-Clear_TC_Timer_Overflow_Flag: 2 stmts out of 2 (100.0%)
+Clear_TC_Timer_Overflow_Flag: 3 stmts out of 3 (100.0%)
 Convert_AD: 21 stmts out of 21 (100.0%)
 CopyProgramCode: 9 stmts out of 9 (100.0%)
 DPU_SelfTest: 2 stmts out of 2 (100.0%)
 Data_Pointer: 2 stmts out of 2 (100.0%)
 DelayAwhile: 9 stmts out of 9 (100.0%)
 DisableAnalogSwitch: 3 stmts out of 3 (100.0%)
-DisableInterrupt: 1 stmts out of 1 (100.0%)
-Disable_Hit_Trigger: 3 stmts out of 3 (100.0%)
+DisableInterrupt: 2 stmts out of 2 (100.0%)
+Disable_Hit_Trigger: 4 stmts out of 4 (100.0%)
 EnableAnalogSwitch: 3 stmts out of 3 (100.0%)
-EnableInterrupt: 1 stmts out of 1 (100.0%)
-Enable_Hit_Trigger: 3 stmts out of 3 (100.0%)
-End_Of_ADC: 22 stmts out of 22 (100.0%)
-Event_Flag: 1 stmts out of 1 (100.0%)
+EnableInterrupt: 2 stmts out of 2 (100.0%)
+Enable_Hit_Trigger: 4 stmts out of 4 (100.0%)
+End_Of_ADC: 25 stmts out of 25 (100.0%)
+Event_Flag: 2 stmts out of 2 (100.0%)
 ExceedsLimit: 7 stmts out of 7 (100.0%)
 Exec_TC: 3 stmts out of 3 (100.0%)
 ExecuteChannelTest: 61 stmts out of 61 (100.0%)
-Fail_Check: 2 stmts out of 2 (100.0%)
+Fail_Check: 3 stmts out of 3 (100.0%)
 FindMinQualityRecord: 19 stmts out of 19 (100.0%)
-FlushMail: 2 stmts out of 2 (100.0%)
+FlushMail: 3 stmts out of 3 (100.0%)
 GetElapsedTime: 2 stmts out of 2 (100.0%)
 GetFreeRecord: 8 stmts out of 8 (100.0%)
 GetMemoryConfiguration: 1 stmts out of 1 (100.0%)
@@ -59,18 +59,18 @@ GetMode: 2 stmts out of 2 (100.0%)
 GetQualityTerm: 6 stmts out of 6 (100.0%)
 GetResetClass: 3 stmts out of 3 (100.0%)
 Get_Code_Byte: 2 stmts out of 2 (100.0%)
-Get_Data_Byte: 2 stmts out of 2 (100.0%)
-Get_LSB1_Counter: 1 stmts out of 1 (100.0%)
-Get_LSB2_Counter: 1 stmts out of 1 (100.0%)
-Get_MSB_Counter: 1 stmts out of 1 (100.0%)
-Get_Result: 3 stmts out of 3 (100.0%)
+Get_Data_Byte: 3 stmts out of 3 (100.0%)
+Get_LSB1_Counter: 2 stmts out of 2 (100.0%)
+Get_LSB2_Counter: 2 stmts out of 2 (100.0%)
+Get_MSB_Counter: 2 stmts out of 2 (100.0%)
+Get_Result: 4 stmts out of 4 (100.0%)
 HandleHealthMonitoring: 9 stmts out of 9 (100.0%)
 HandleHitTrigger: 63 stmts out of 63 (100.0%)
 HandleTelecommand: 38 stmts out of 38 (100.0%)
-Handle_TC: 4 stmts out of 4 (100.0%)
+Handle_TC: 10 stmts out of 10 (100.0%)
 HighVoltageCurrent: 9 stmts out of 9 (100.0%)
-Hit_ISR_Tests: 107 stmts out of 107 (100.0%)
-Hit_Trigger_Flag: 1 stmts out of 1 (100.0%)
+Hit_ISR_Tests: 116 stmts out of 116 (100.0%)
+Hit_Trigger_Flag: 2 stmts out of 2 (100.0%)
 IncrementCounters: 10 stmts out of 10 (100.0%)
 InitAcquisitionTask: 4 stmts out of 4 (100.0%)
 InitClassification: 12 stmts out of 12 (100.0%)
@@ -88,8 +88,8 @@ MeasureTemperature: 22 stmts out of 22 (100.0%)
 MeasureVoltage: 27 stmts out of 27 (100.0%)
 Monitor: 49 stmts out of 49 (100.0%)
 Monitor_DPU_Voltage: 13 stmts out of 13 (100.0%)
-Monitor_Health: 6 stmts out of 6 (100.0%)
-Monitoring_Task_Tests: 116 stmts out of 116 (100.0%)
+Monitor_Health: 12 stmts out of 12 (100.0%)
+Monitoring_Task_Tests: 125 stmts out of 125 (100.0%)
 Next: 4 stmts out of 4 (100.0%)
 Next_Rand: 3 stmts out of 3 (100.0%)
 PatchCode: 30 stmts out of 30 (100.0%)
@@ -99,23 +99,23 @@ ReadDelayCounters: 11 stmts out of 11 (100.0%)
 ReadRiseTimeCounter: 3 stmts out of 3 (100.0%)
 ReadSensorUnit: 2 stmts out of 2 (100.0%)
 Read_AD_Channel: 23 stmts out of 23 (100.0%)
-Read_Data_Memory: 21 stmts out of 21 (100.0%)
-Read_TC_LSB: 1 stmts out of 1 (100.0%)
-Read_TC_MSB: 1 stmts out of 1 (100.0%)
-Reboot: 3 stmts out of 3 (100.0%)
+Read_Data_Memory: 33 stmts out of 33 (100.0%)
+Read_TC_LSB: 2 stmts out of 2 (100.0%)
+Read_TC_MSB: 2 stmts out of 2 (100.0%)
+Reboot: 5 stmts out of 5 (100.0%)
 RecordEvent: 16 stmts out of 16 (100.0%)
-Report_Checks: 1 stmts out of 1 (100.0%)
-Report_End_Of_ADC_Count: 2 stmts out of 2 (100.0%)
-Report_Event_Histo: 11 stmts out of 11 (100.0%)
-Report_Start_Conversion_Count: 2 stmts out of 2 (100.0%)
+Report_Checks: 3 stmts out of 3 (100.0%)
+Report_End_Of_ADC_Count: 3 stmts out of 3 (100.0%)
+Report_Event_Histo: 13 stmts out of 13 (100.0%)
+Report_Start_Conversion_Count: 3 stmts out of 3 (100.0%)
 ResetDelayCounters: 1 stmts out of 1 (100.0%)
 ResetEventQueueLength: 2 stmts out of 2 (100.0%)
-ResetInterruptMask: 2 stmts out of 2 (100.0%)
+ResetInterruptMask: 3 stmts out of 3 (100.0%)
 ResetPeakDetector: 2 stmts out of 2 (100.0%)
 RestoreSettings: 17 stmts out of 17 (100.0%)
-Rise_Time_Counter: 1 stmts out of 1 (100.0%)
+Rise_Time_Counter: 2 stmts out of 2 (100.0%)
 RoughLogarithm: 9 stmts out of 9 (100.0%)
-SU_Self_Test_Tests: 145 stmts out of 145 (100.0%)
+SU_Self_Test_Tests: 154 stmts out of 154 (100.0%)
 SelectSelfTestChannel: 8 stmts out of 8 (100.0%)
 SelfTestChannel: 50 stmts out of 50 (100.0%)
 SelfTest_SU: 12 stmts out of 12 (100.0%)
@@ -124,63 +124,63 @@ Send_Patch_Data: 19 stmts out of 19 (100.0%)
 Send_TC: 11 stmts out of 11 (100.0%)
 Send_TC_Word: 6 stmts out of 6 (100.0%)
 SetErrorStatus: 2 stmts out of 2 (100.0%)
-SetInterruptMask: 2 stmts out of 2 (100.0%)
+SetInterruptMask: 3 stmts out of 3 (100.0%)
 SetMemoryConfiguration: 7 stmts out of 7 (100.0%)
 SetMode: 2 stmts out of 2 (100.0%)
 SetModeStatusError: 2 stmts out of 2 (100.0%)
 SetSoftwareError: 2 stmts out of 2 (100.0%)
 SetTestPulseLevel: 2 stmts out of 2 (100.0%)
-SetTimeSlice: 1 stmts out of 1 (100.0%)
+SetTimeSlice: 2 stmts out of 2 (100.0%)
 Set_AD_Delay: 7 stmts out of 7 (100.0%)
-Set_AD_Nominal: 31 stmts out of 31 (100.0%)
-Set_AD_Unlimited: 9 stmts out of 9 (100.0%)
-Set_Data_Byte: 2 stmts out of 2 (100.0%)
+Set_AD_Nominal: 32 stmts out of 32 (100.0%)
+Set_AD_Unlimited: 10 stmts out of 10 (100.0%)
+Set_Data_Byte: 3 stmts out of 3 (100.0%)
 Set_SU_Error: 3 stmts out of 3 (100.0%)
-Set_SU_Self_Test_Ch: 1 stmts out of 1 (100.0%)
+Set_SU_Self_Test_Ch: 2 stmts out of 2 (100.0%)
 Set_SU_TriggerLevels: 11 stmts out of 11 (100.0%)
 Set_TC_Error: 2 stmts out of 2 (100.0%)
-Set_TC_Timer_Overflow_Flag: 2 stmts out of 2 (100.0%)
-Set_Test_Pulse_Level: 3 stmts out of 3 (100.0%)
-Set_Trigger_SU: 3 stmts out of 3 (100.0%)
-ShortDelay: 2 stmts out of 2 (100.0%)
+Set_TC_Timer_Overflow_Flag: 3 stmts out of 3 (100.0%)
+Set_Test_Pulse_Level: 4 stmts out of 4 (100.0%)
+Set_Trigger_SU: 4 stmts out of 4 (100.0%)
+ShortDelay: 3 stmts out of 3 (100.0%)
 Short_Value: 2 stmts out of 2 (100.0%)
 SignalMemoryErrors: 11 stmts out of 11 (100.0%)
-SignalPeakDetectorReset: 1 stmts out of 1 (100.0%)
-Sim_Self_Test_Trigger: 7 stmts out of 7 (100.0%)
-Start_Conversion: 24 stmts out of 24 (100.0%)
-TC_ISR_Tests: 51 stmts out of 51 (100.0%)
-TC_Interrupt: 2 stmts out of 2 (100.0%)
-TC_Task_Tests: 263 stmts out of 263 (100.0%)
-TC_Timer_Overflow_Flag: 1 stmts out of 1 (100.0%)
+SignalPeakDetectorReset: 2 stmts out of 2 (100.0%)
+Sim_Self_Test_Trigger: 8 stmts out of 8 (100.0%)
+Start_Conversion: 27 stmts out of 27 (100.0%)
+TC_ISR_Tests: 64 stmts out of 64 (100.0%)
+TC_Interrupt: 8 stmts out of 8 (100.0%)
+TC_Task_Tests: 307 stmts out of 307 (100.0%)
+TC_Timer_Overflow_Flag: 2 stmts out of 2 (100.0%)
 TemperatureFailure: 4 stmts out of 4 (100.0%)
-TestMemBits: 2 stmts out of 2 (100.0%)
-TestMemData: 2 stmts out of 2 (100.0%)
-TestMemSeq: 2 stmts out of 2 (100.0%)
-Trigger_Hit: 4 stmts out of 4 (100.0%)
+TestMemBits: 3 stmts out of 3 (100.0%)
+TestMemData: 3 stmts out of 3 (100.0%)
+TestMemSeq: 3 stmts out of 3 (100.0%)
+Trigger_Hit: 13 stmts out of 13 (100.0%)
 Trigger_SU_Hit: 3 stmts out of 3 (100.0%)
-Trigger_Source_0: 1 stmts out of 1 (100.0%)
-Trigger_Source_1: 1 stmts out of 1 (100.0%)
+Trigger_Source_0: 2 stmts out of 2 (100.0%)
+Trigger_Source_1: 2 stmts out of 2 (100.0%)
 UpdatePeriodCounter: 4 stmts out of 4 (100.0%)
 UpdateTime: 2 stmts out of 2 (100.0%)
-Update_ADC_Channel_Reg: 1 stmts out of 1 (100.0%)
+Update_ADC_Channel_Reg: 2 stmts out of 2 (100.0%)
 Update_SU_State: 8 stmts out of 8 (100.0%)
-V_Down: 5 stmts out of 5 (100.0%)
-WaitInterrupt: 1 stmts out of 1 (100.0%)
-WaitInterval: 1 stmts out of 1 (100.0%)
-WaitMail: 9 stmts out of 9 (100.0%)
-WaitTimeout: 1 stmts out of 1 (100.0%)
-Write_TM_LSB: 2 stmts out of 2 (100.0%)
-Write_TM_MSB: 2 stmts out of 2 (100.0%)
-isr_send_message: 3 stmts out of 3 (100.0%)
+V_Down: 6 stmts out of 6 (100.0%)
+WaitInterrupt: 2 stmts out of 2 (100.0%)
+WaitInterval: 2 stmts out of 2 (100.0%)
+WaitMail: 11 stmts out of 11 (100.0%)
+WaitTimeout: 2 stmts out of 2 (100.0%)
+Write_TM_LSB: 3 stmts out of 3 (100.0%)
+Write_TM_MSB: 3 stmts out of 3 (100.0%)
+isr_send_message: 4 stmts out of 4 (100.0%)
 UpdateTarget: 153 stmts out of 154 (99.4%)
 ClassifyEvent: 59 stmts out of 60 (98.3%)
-TM_Tests: 51 stmts out of 52 (98.1%)
 MemoryPatch: 41 stmts out of 42 (97.6%)
 HandleAcquisition: 57 stmts out of 59 (96.6%)
-StartSystem: 19 stmts out of 20 (95.0%)
+StartSystem: 23 stmts out of 24 (95.8%)
 Switch_SU_State: 13 stmts out of 14 (92.9%)
 TC_InterruptService: 117 stmts out of 126 (92.9%)
 TM_InterruptService: 25 stmts out of 27 (92.6%)
+TM_Tests: 86 stmts out of 93 (92.5%)
 SetTriggerLevel: 29 stmts out of 32 (90.6%)
 ExecuteCommand: 73 stmts out of 81 (90.1%)
 SetSensorUnitOff: 8 stmts out of 9 (88.9%)
@@ -188,10 +188,10 @@ Switch_SU_Off: 16 stmts out of 18 (88.9%)
 Switch_SU_On: 16 stmts out of 18 (88.9%)
 WriteMemory: 16 stmts out of 18 (88.9%)
 Start_SU_SwitchingOn: 7 stmts out of 8 (87.5%)
-Check_Current: 13 stmts out of 15 (86.7%)
 PatchExecCommandOk: 5 stmts out of 6 (83.3%)
-CreateTask: 8 stmts out of 10 (80.0%)
-SendTaskMail: 4 stmts out of 5 (80.0%)
+Check_Current: 14 stmts out of 17 (82.4%)
+CreateTask: 9 stmts out of 11 (81.8%)
 Check_RAM: 22 stmts out of 28 (78.6%)
-main: 5 stmts out of 7 (71.4%)
+main: 6 stmts out of 8 (75.0%)
+SendTaskMail: 5 stmts out of 7 (71.4%)
 Monitor_SU_Voltage: 11 stmts out of 22 (50.0%)

debie1/.frama-c/debie1.parse/metrics.log

@@ -100,15 +100,15 @@ Potential entry points (8)
 
 Global metrics
 ============== 
-Sloc = 3077
-Decision point = 417
+Sloc = 3345
+Decision point = 418
 Global variables = 104
-If = 310
+If = 311
 Loop = 75
 Goto = 42
-Assignment = 1118
+Assignment = 1117
 Exit point = 191
 Function = 191
-Function call = 1071
-Pointer dereferencing = 249
-Cyclomatic complexity = 608
+Function call = 1305
+Pointer dereferencing = 257
+Cyclomatic complexity = 609

debie1/.frama-c/debie1.parse/warnings.log

 code/health.c:2035:[kernel:parser:decimal-float] warning: Floating-point constant 1.085 is not represented exactly. Will use 0x1.15c28f5c28f5cp0.
 (warn-once: no further messages from category 'parser:decimal-float' will be emitted)
+code/harness/harness.c:496:[variadic] warning: Possible portability issues with enum type for argument 2 (use -variadic-no-strict to avoid this warning).

debie1/code/harness/harness.c

@@ -170,7 +170,7 @@ void SetTimeSlice(unsigned int time_slice)
 /*                   the software_error register.                            */
 {
 #if defined(TRACE_HARNESS)
-   printf ("SetTimeSlice %d\n", time_slice);
+   printf ("SetTimeSlice %u\n", time_slice);
 #endif
 }
 
@@ -185,7 +185,7 @@ static unsigned int ad_converting = 0;
 void ShortDelay (uint_least8_t delay_loops)
 {
 #if defined(TRACE_HARNESS)
-   printf ("ShortDelay %d\n", delay_loops);
+   printf ("ShortDelay %u\n", delay_loops);
 #endif
 
    ad_converting = 0;
@@ -208,7 +208,7 @@ unsigned char isr_send_message (
 /*                    telemetry.                                            */
 {
 #if defined(TRACE_HARNESS)
-   printf ("isr_send_message to %d, message %d = 0x%x\n",
+   printf ("isr_send_message to %hhu, message %hu = 0x%hx\n",
       mailbox, message, message);
 #endif
    SendTaskMail (mailbox, message, 0);
@@ -281,7 +281,7 @@ signed char SetInterruptMask(unsigned char ISR_MaskNumber)
 /* Algorithm      : RTX syntax is used.                                      */
 {
 #if defined(TRACE_HARNESS)
-   printf ("SetInterruptMask 0x%x\n", ISR_MaskNumber);
+  printf ("SetInterruptMask 0x%hhx\n", ISR_MaskNumber);
 #endif
    return 0;  /* Success. */
 }
@@ -301,7 +301,7 @@ signed char ResetInterruptMask(unsigned char ISR_MaskNumber)
 /* Algorithm      : RTX syntax is used.                                      */
 {
 #if defined(TRACE_HARNESS)
-   printf ("ResetInterruptMask 0x%x\n", ISR_MaskNumber);
+   printf ("ResetInterruptMask 0x%hhx\n", ISR_MaskNumber);
 #endif
    return 0;  /* Success. */
 }
@@ -406,7 +406,7 @@ void WaitMail (incoming_mail_t EXTERNAL *message) COMPACT_DATA REENTRANT_FUNC
       *(message -> message)       = mail_message[message -> mailbox_number];
 
 #if defined(TRACE_HARNESS)
-      printf ("Message from %d is %d = 0x%x\n",
+      printf ("Message from %d is %d = 0x%hhx\n",
          message -> mailbox_number,
          *(message -> message),
          *(message -> message));
@@ -451,7 +451,7 @@ unsigned char Check_Current (unsigned char bits)
 {
    unsigned char val;
 #if defined(TRACE_HARNESS)
-   printf ("Check_Current 0x%x\n", bits);
+   printf ("Check_Current 0x%hhx\n", bits);
 #endif
    switch (bits) {
    case   3: val =  1; break;
@@ -493,7 +493,7 @@ unsigned char Check_Current (unsigned char bits)
 void Reboot(reset_class_t boot_type)
 {
 #if defined(TRACE_HARNESS)
-   printf ("Reboot %d\n", boot_type);
+   printf ("Reboot %u\n", boot_type);
 #endif
 
    if (boot_type == checksum_reset_e)
@@ -524,7 +524,7 @@ unsigned char TestMemBits (data_address_t address)
  */
 {
 #if defined(TRACE_HARNESS)
-   printf ("TestMemBits 0x%x\n", address);
+   printf ("TestMemBits 0x%hhx\n", address);
 #endif
    return 0;
 }
@@ -551,7 +551,7 @@ unsigned char TestMemData (
  */
 {
 #if defined(TRACE_HARNESS)
-   printf ("TestMemData start 0x%x, bytes %d\n", start, bytes);
+  printf ("TestMemData start 0x%hhx, bytes %u\n", start, bytes);
 #endif
    return 0;
 }
@@ -579,7 +579,7 @@ unsigned char TestMemSeq (
  */
 {
 #if defined(TRACE_HARNESS)
-   printf ("TestMemSeq start 0x%x, bytes %d\n", start, bytes);
+   printf ("TestMemSeq start 0x%hhx, bytes %u\n", start, bytes);
 #endif
    return 0;
 }
@@ -623,7 +623,7 @@ static unsigned char tm_msb, tm_lsb;
 void Write_TM_LSB (unsigned char value)
 {
 #if defined(TRACE_HARNESS)
-   printf ("Write_TM_LSB %d = 0x%x\n", value, value);
+   printf ("Write_TM_LSB %d = 0x%hhx\n", value, value);
 #endif
    tm_lsb = value;
 }
@@ -632,7 +632,7 @@ void Write_TM_LSB (unsigned char value)
 void Write_TM_MSB (unsigned char value)
 {
 #if defined(TRACE_HARNESS)
-   printf ("Write_TM_MSB %d = 0x%x\n", value, value);
+   printf ("Write_TM_MSB %d = 0x%hhx\n", value, value);
 #endif
    tm_msb = value;
 }
@@ -981,7 +981,7 @@ static unsigned int ad_fail_index = 0;
 void Update_ADC_Channel_Reg (unsigned char channel)
 {
 #if defined(TRACE_HARNESS)
-   printf ("Update_ADC_Channel_Reg %x\n", channel);
+   printf ("Update_ADC_Channel_Reg %hhx\n", channel);
 #endif
 }
 
@@ -1002,7 +1002,7 @@ void Start_Conversion (void)
    channel = ADC_channel_register & 0x3f;
 
 #if defined(TRACE_HARNESS)
-   printf ("Start_Conversion on channel %d\n", channel);
+   printf ("Start_Conversion on channel %u\n", channel);
 #endif
 
    if (ad_converting != 0)
@@ -1056,7 +1056,7 @@ void Report_Start_Conversion_Count (int problem)
  */
 {
 #if defined(TRACE_HARNESS)
-   printf ("Called Start_Conversion %d times in problem %d.\n",
+   printf ("Called Start_Conversion %u times in problem %d.\n",
       start_conversion_count, problem);
 #endif
 
@@ -1137,7 +1137,7 @@ void Report_End_Of_ADC_Count (int problem)
  */
 {
 #if defined(TRACE_HARNESS)
-   printf ("Called End_Of_ADC %d times in problem %d.\n",
+   printf ("Called End_Of_ADC %u times in problem %d.\n",
       end_of_adc_count, problem);
 #endif
 
@@ -1154,7 +1154,7 @@ unsigned char Get_Result (void)
    value = (ad_value >> 8) & 0xff;
 
 #if defined(TRACE_HARNESS)
-   printf ("Get_Result %d = 0x%x\n", value, value);
+   printf ("Get_Result %hhu = 0x%hhx\n", value, value);
 #endif
 
    /* Shift the LSB to the MSB, for next Get_Result: */
@@ -1256,7 +1256,7 @@ static void Set_Trigger_SU (sensor_index_t SU)
 /* Sets the given SU in trigger_source_0/1. */
 {
 #if defined(TRACE_HARNESS)
-   printf ("Set Trigger SU index %d\n", SU);
+   printf ("Set Trigger SU index %u\n", SU);
 #endif
 
    trigger_source_0 =  SU       & 1;
@@ -1362,7 +1362,7 @@ void Set_SU_Self_Test_Ch (unsigned char value)
 /* Set the SU Self Test Channel selectors. */
 {
 #if defined(TRACE_HARNESS)
-   printf ("Set SU Self-Test Channel %x\n", value);
+   printf ("Set SU Self-Test Channel %hhx\n", value);
 #endif
 }
 
@@ -1371,7 +1371,7 @@ void Set_Test_Pulse_Level (unsigned char level)
 /* Set the SU Self Test pulse level. */
 {
 #if defined(TRACE_HARNESS)
-   printf ("Set SU Self-Test Pulse Level %d\n", level);
+   printf ("Set SU Self-Test Pulse Level %hhu\n", level);
 #endif
    self_test_pulse = level;
    Sim_Self_Test_Trigger ();
@@ -1409,7 +1409,7 @@ void SignalPeakDetectorReset(
    unsigned char high_reset_value)
 {
 #if defined(TRACE_HARNESS)
-   printf ("SignalPeakDetectorReset low %d, high %d\n",
+   printf ("SignalPeakDetectorReset low %hhu, high %hhu\n",
       low_reset_value, high_reset_value);
 #endif
 }
@@ -1450,7 +1450,7 @@ unsigned short int Short_Value (tm_ushort_t *x)
 void Call_Patch (fptr_t func)
 {
 #if defined(TRACE_HARNESS)
-   printf ("Call_Patch 0x%x\n", (code_address_t)func);
+   printf ("Call_Patch 0x%hx\n", (code_address_t)func);
 #endif
 }
 
@@ -1576,7 +1576,7 @@ static void Report_Checks (void)
 {
    TARGET_MARK;
 #if defined(TRACE_HARNESS)
-   printf ("Total checks done %d, failed %d\n", checks, check_errors);
+   printf ("Total checks done %u, failed %u\n", checks, check_errors);
 #endif
 }
 
@@ -1586,7 +1586,7 @@ static void Fail_Check (char *message)
 {
    check_errors ++;
 #if defined(TRACE_HARNESS)
-   printf ("%s: FAILED (#%d)\n", message, check_errors);
+   printf ("%s: FAILED (#%u)\n", message, check_errors);
 #endif
 }
 
@@ -2632,7 +2632,7 @@ void Monitoring_Task_Tests (void)
       }
 
 #if defined(TRACE_HARNESS)
-      printf ("Total hits %d\n", total_adc_hits);
+      printf ("Total hits %u\n", total_adc_hits);
 #endif
 
       Check_Nonzero (total_adc_hits);
@@ -2655,7 +2655,7 @@ void Monitoring_Task_Tests (void)
       }
 
 #if defined(TRACE_HARNESS)
-      printf ("Total hits %d\n", total_adc_hits);
+      printf ("Total hits %u\n", total_adc_hits);
 #endif
 
       Check_Nonzero (total_adc_hits);
@@ -2693,7 +2693,7 @@ void Monitoring_Task_Tests (void)
             tot_errors ++;
 
 #if defined(TRACE_HARNESS)
-            printf ("Monitoring (6d) error %d, error status %x\n",
+            printf ("Monitoring (6d) error %d, error status %hhx\n",
                tot_errors, telemetry_data.error_status);
 #endif
             Clear_Errors ();
@@ -2730,7 +2730,7 @@ void Monitoring_Task_Tests (void)
             tot_errors ++;
 
 #if defined(TRACE_HARNESS)
-            printf ("Monitoring (6e) error %d, error status %x\n",
+            printf ("Monitoring (6e) error %d, error status %hhx\n",
                tot_errors, telemetry_data.error_status);
 #endif
             Clear_Errors ();
@@ -3151,7 +3151,7 @@ void Report_Event_Histo (void)
    for (sen = 0; sen < NUM_SU; sen ++)
       for (class = 0; class <NUM_CLASSES; class ++)
       {
-         printf ("Events from SU %d, class %d: %d\n",
+         printf ("Events from SU %u, class %d: %d\n",
             sen, class, science_data.event_counter[sen][class]);
       }
 #endif
@@ -3275,7 +3275,7 @@ static void Acquisition_Tests (void)
       }
 
 #if defined(TRACE_HARNESS)
-      printf ("Science Data filled with %d events after %d hits.\n",
+      printf ("Science Data filled with %u events after %u hits.\n",
          max_events, hits);
 #endif
       Report_Event_Histo ();
@@ -3690,7 +3690,7 @@ void StartSystem(unsigned char task_number)
       test_round ++;
 
 #if defined(TRACE_HARNESS)
-      printf ("Test round %d\n", test_round);
+      printf ("Test round %u\n", test_round);
 #endif
 
       TARGET_START_TEST;